extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-14 09:06:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where we failed to delete pre-saved history entries due to race conditions causing the DB to be locked

Browse Source
This commit is contained in:
David Dworken 2023-09-12 18:55:13 -07:00
parent aebf526d1f
commit 57c5a69f7d
No known key found for this signature in database
2 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/cmd/saveHistoryEntry.go
View File

@ -138,17 +138,21 @@ func saveHistoryEntry(ctx context.Context) {
// Drop any entries from pre-saving since they're no longer needed // Drop any entries from pre-saving since they're no longer needed
if config.BetaMode { if config.BetaMode {
tx, err := lib.MakeWhereQueryFromSearch(ctx, db, "cwd:"+entry.CurrentWorkingDirectory+" start_time:"+strconv.FormatInt(entry.StartTime.Unix(), 10)) deletePresavedEntryFunc := func() error {
if err != nil { tx, err := lib.MakeWhereQueryFromSearch(ctx, db, "cwd:"+entry.CurrentWorkingDirectory+" start_time:"+strconv.FormatInt(entry.StartTime.Unix(), 10)+" end_time:1970/01/01_00:00:00_+0000")
lib.CheckFatalError(fmt.Errorf("failed to query for pre-saved history entry: %w", err)) if err != nil {
} return fmt.Errorf("failed to query for pre-saved history entry: %w", err)
res := tx.Delete(&data.HistoryEntry{}) }
if res.Error != nil { res := tx.Delete(&data.HistoryEntry{})
lib.CheckFatalError(fmt.Errorf("failed to delete pre-saved history entry (expected command=%#v): %w", entry.Command, res.Error)) if res.Error != nil {
} return fmt.Errorf("failed to delete pre-saved history entry (expected command=%#v): %w", entry.Command, res.Error)
if res.RowsAffected > 1 { }
lib.CheckFatalError(fmt.Errorf("attempted to delete pre-saved entry, but something went wrong since we deleted %d rows", res.RowsAffected)) if res.RowsAffected > 1 {
return fmt.Errorf("attempted to delete pre-saved entry, but something went wrong since we deleted %d rows", res.RowsAffected)
}
return nil
} }
lib.CheckFatalError(lib.RetryingDbFunction(deletePresavedEntryFunc))
} }
// Persist it locally // Persist it locally

52
client/lib/lib.go
View File

@ -705,36 +705,36 @@ func normalizeEntryTimezone(entry data.HistoryEntry) data.HistoryEntry {
return entry return entry
} }
func ReliableDbCreate(db *gorm.DB, entry data.HistoryEntry) error { func RetryingDbFunction(dbFunc func() error) error {
entry = normalizeEntryTimezone(entry)
var err error = nil var err error = nil
i := 0 i := 0
for i = 0; i < 10; i++ { for i = 0; i < 10; i++ {
result := db.Create(entry) err = dbFunc()
err = result.Error
if err == nil { if err == nil {
return nil return nil
} }
if err != nil { errMsg := err.Error()
errMsg := err.Error() if errMsg == "database is locked (5) (SQLITE_BUSY)" || errMsg == "database is locked (261)" {
if errMsg == "database is locked (5) (SQLITE_BUSY)" || errMsg == "database is locked (261)" { time.Sleep(time.Duration(i*rand.Intn(100)) * time.Millisecond)
time.Sleep(time.Duration(i*rand.Intn(100)) * time.Millisecond) continue
continue
}
if strings.Contains(errMsg, "UNIQUE constraint failed") {
if i == 0 {
return err
} else {
return nil
}
}
return fmt.Errorf("unrecoverable sqlite error: %w", err)
} }
if err != nil && err.Error() != "database is locked (5) (SQLITE_BUSY)" { if strings.Contains(errMsg, "UNIQUE constraint failed") {
return fmt.Errorf("unrecoverable sqlite error: %w", err) if i == 0 {
return err
} else {
return nil
}
} }
return fmt.Errorf("unrecoverable sqlite error: %w", err)
} }
return fmt.Errorf("failed to create DB entry even with %d retries: %w", i, err) return fmt.Errorf("failed to execute DB transaction even with %d retries: %w", i, err)
}
func ReliableDbCreate(db *gorm.DB, entry data.HistoryEntry) error {
entry = normalizeEntryTimezone(entry)
return RetryingDbFunction(func() error {
return db.Create(entry).Error
})
} }
func EncryptAndMarshal(config hctx.ClientConfig, entries []*data.HistoryEntry) ([]byte, error) { func EncryptAndMarshal(config hctx.ClientConfig, entries []*data.HistoryEntry) ([]byte, error) {
@ -952,9 +952,17 @@ func parseAtomizedToken(ctx context.Context, token string) (string, interface{},
// internally for pre-saving history entries. // internally for pre-saving history entries.
t, err := parseTimeGenerously(val) t, err := parseTimeGenerously(val)
if err != nil { if err != nil {
return "", nil, nil, fmt.Errorf("failed to parse after:%s as a timestamp: %w", val, err) return "", nil, nil, fmt.Errorf("failed to parse start_time:%s as a timestamp: %w", val, err)
} }
return "(CAST(strftime(\"%s\",start_time) AS INTEGER) = ?)", t.Unix(), nil, nil return "(CAST(strftime(\"%s\",start_time) AS INTEGER) = ?)", t.Unix(), nil, nil
case "end_time":
// Note that this atom probably isn't useful for interactive usage since it does exact matching, but we use it
// internally for pre-saving history entries.
t, err := parseTimeGenerously(val)
if err != nil {
return "", nil, nil, fmt.Errorf("failed to parse end_time:%s as a timestamp: %w", val, err)
}
return "(CAST(strftime(\"%s\",end_time) AS INTEGER) = ?)", t.Unix(), nil, nil
case "command": case "command":
return "(instr(command, ?) > 0)", val, nil, nil return "(instr(command, ?) > 0)", val, nil, nil
default: default: