Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

more logs around locking. fix for long-held lock when committing convo reply and description that could cause race condition.

Dane Schneider4be2a848792c
diff --git a/app/server/db/locks.go b/app/server/db/locks.go
index 059153d9..8d6f53a1 100644
--- a/app/server/db/locks.go
+++ b/app/server/db/locks.go
@@ -12,7 +12,7 @@ import (
)
const lockHeartbeatInterval = 700 * time.Millisecond
-const lockHeartbeatTimeout = 4 * time.Second
+const lockHeartbeatTimeout = 10 * time.Second
const maxRetries = 10
const initialRetryInterval = 100 * time.Millisecond
@@ -36,7 +36,7 @@ func LockRepo(params LockRepoParams) (string, error) {
}
func lockRepo(params LockRepoParams, numRetry int) (string, error) {
- log.Println("locking repo")
+ log.Printf("locking repo. orgId: %s | planId: %s | scope: %s, \n", params.OrgId, params.PlanId, params.Scope)
// spew.Dump(params)
orgId := params.OrgId
@@ -70,6 +70,7 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
var locks []*repoLock
fn := func() error {
+ log.Println("obtaining repo lock with query")
rows, err := tx.Query(query, queryArgs...)
if err != nil {
if pqErr, ok := err.(*pq.Error); ok && (pqErr.Code == "40001" || pqErr.Code == "40P01") {
@@ -79,6 +80,7 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
return fmt.Errorf("error getting repo locks: %v", err)
}
+ log.Println("repo lock query executed")
defer rows.Close()
@@ -114,6 +116,7 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
if pqErr, ok := err.(*pq.Error); ok && (pqErr.Code == "40001" || pqErr.Code == "40P01") {
if numRetry > maxRetries {
err = fmt.Errorf("plan is currently being updated by another user")
+ log.Println("max retries reached on serialization error, returning error")
return "", err
}
@@ -182,6 +185,8 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
return "", err
}
+ log.Println("can acquire lock - inserting new lock")
+
// Insert the new lock
var lockPlanBuildId *string
if planBuildId != "" {
@@ -252,7 +257,7 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
select {
case <-ctx.Done():
// log.Printf("case <-stream.Ctx.Done(): %s\n", newLock.Id)
- err := UnlockRepo(newLock.Id)
+ err := DeleteRepoLock(newLock.Id)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
@@ -296,8 +301,8 @@ func lockRepo(params LockRepoParams, numRetry int) (string, error) {
return newLock.Id, nil
}
-func UnlockRepo(id string) error {
- log.Println("unlocking repo:", id)
+func DeleteRepoLock(id string) error {
+ log.Println("deleting repo lock:", id)
query := "DELETE FROM repo_locks WHERE id = $1"
_, err := Conn.Exec(query, id)
@@ -305,7 +310,7 @@ func UnlockRepo(id string) error {
return fmt.Errorf("error removing lock: %v", err)
}
- log.Println("repo unlocked successfully:", id)
+ log.Println("repo lock deleted successfully:", id)
return nil
}
diff --git a/app/server/db/result_helpers.go b/app/server/db/result_helpers.go
index ebca5957..42d2c0df 100644
--- a/app/server/db/result_helpers.go
+++ b/app/server/db/result_helpers.go
@@ -36,6 +36,8 @@ func StorePlanResult(result *PlanFileResult) error {
return fmt.Errorf("error creating results dir: %v", err)
}
+ log.Printf("Storing plan result: %s", result.Id)
+
err = os.WriteFile(filepath.Join(resultsDir, result.Id+".json"), bytes, 0644)
if err != nil {
@@ -135,11 +137,22 @@ func GetCurrentPlanState(params CurrentPlanStateParams) (*shared.CurrentPlanStat
pendingResultPaths := map[string]bool{}
for _, dbPlanFileResult := range dbPlanFileResults {
+ // log.Printf("Plan file result: %s", dbPlanFileResult.Id)
+
apiResult := dbPlanFileResult.ToApi()
apiPlanFileResults = append(apiPlanFileResults, apiResult)
if apiResult.IsPending() {
+ // log.Printf("Pending result: %s", dbPlanFileResult.Id)
+
pendingResultPaths[apiResult.Path] = true
+ } else {
+ // log.Printf("Not pending result: %s", apiResult.Id)
+ // log.Printf("Applied at: %v", apiResult.AppliedAt)
+ // log.Printf("Rejected at: %v", apiResult.RejectedAt)
+ // log.Printf("Content: %v", apiResult.Content != "")
+ // log.Printf("Num Replacement: %d", len(apiResult.Replacements))
+ // log.Printf("Num Pending Replacements: %v", apiResult.NumPendingReplacements())
}
}
planResult := GetPlanResult(apiPlanFileResults)
@@ -249,6 +262,8 @@ func GetPlanFileResults(orgId, planId string) ([]*PlanFileResult, error) {
resultCh := make(chan *PlanFileResult, len(files))
for _, file := range files {
+ // log.Printf("Result file: %s", file.Name())
+
go func(file os.DirEntry) {
bytes, err := os.ReadFile(filepath.Join(resultsDir, file.Name()))
@@ -298,6 +313,7 @@ func GetPlanResult(planFileResults []*shared.PlanFileResult) *shared.PlanResult
resByPath[planFileRes.Path] = append(resByPath[planFileRes.Path], planFileRes)
if !hasPath {
+ // log.Printf("Adding res path: %s", planFileRes.Path)
paths = append(paths, planFileRes.Path)
}
}
diff --git a/app/server/handlers/branches.go b/app/server/handlers/branches.go
index d8d416c1..f0eceee2 100644
--- a/app/server/handlers/branches.go
+++ b/app/server/handlers/branches.go
@@ -197,7 +197,7 @@ func DeleteBranchHandler(w http.ResponseWriter, r *http.Request) {
}
defer func() {
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
diff --git a/app/server/handlers/fs_helper.go b/app/server/handlers/fs_helper.go
index c3c38a36..5702a61a 100644
--- a/app/server/handlers/fs_helper.go
+++ b/app/server/handlers/fs_helper.go
@@ -59,7 +59,7 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
log.Printf("Error rolling back repo: %v\n", err)
}
- err = db.UnlockRepo(repoLockId)
+ err = db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
diff --git a/app/server/model/plan/build_finish.go b/app/server/model/plan/build_finish.go
index acbc5332..a8bec870 100644
--- a/app/server/model/plan/build_finish.go
+++ b/app/server/model/plan/build_finish.go
@@ -93,7 +93,7 @@ func (state *activeBuildStreamFileState) onFinishBuild() {
log.Println("Cleared uncommitted changes")
}
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
@@ -238,19 +238,23 @@ func (fileState *activeBuildStreamFileState) onFinishBuildFile(planRes *db.PlanF
var err error
defer func() {
if err != nil {
- log.Printf("Error: %v\n", err)
+ log.Printf("Error storing plan result: %v\n", err)
err = db.GitClearUncommittedChanges(currentOrgId, planId)
if err != nil {
log.Printf("Error clearing uncommitted changes: %v\n", err)
}
}
- err := db.UnlockRepo(repoLockId)
+ log.Println("Plan result stored successfully. Unlocking repo.")
+
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
}()
+ log.Println("Storing plan result")
+
err = db.StorePlanResult(planRes)
if err != nil {
log.Printf("Error storing plan result: %v\n", err)
@@ -261,6 +265,8 @@ func (fileState *activeBuildStreamFileState) onFinishBuildFile(planRes *db.PlanF
}
return err
}
+
+ log.Println("Plan result stored")
return nil
}()
diff --git a/app/server/model/plan/build_load.go b/app/server/model/plan/build_load.go
index fe5cb3fb..1e317c30 100644
--- a/app/server/model/plan/build_load.go
+++ b/app/server/model/plan/build_load.go
@@ -43,7 +43,7 @@ func (state *activeBuildStreamState) loadPendingBuilds() (map[string][]*types.Ac
err = func() error {
defer func() {
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
@@ -158,6 +158,8 @@ func (state *activeBuildStreamFileState) loadBuildFile(activeBuild *types.Active
var currentPlan *shared.CurrentPlanState
var convo []*db.ConvoMessage
+ log.Println("Locking repo for load build file")
+
repoLockId, err := db.LockRepo(
db.LockRepoParams{
OrgId: currentOrgId,
@@ -183,9 +185,13 @@ func (state *activeBuildStreamFileState) loadBuildFile(activeBuild *types.Active
return err
}
+ log.Println("Locked repo for load build file")
+
err = func() error {
defer func() {
- err := db.UnlockRepo(repoLockId)
+ log.Printf("Unlocking repo for load build file")
+
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
diff --git a/app/server/model/plan/build_stream_line_nums.go b/app/server/model/plan/build_stream_line_nums.go
index 3897203a..373b4382 100644
--- a/app/server/model/plan/build_stream_line_nums.go
+++ b/app/server/model/plan/build_stream_line_nums.go
@@ -217,9 +217,8 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(str
fileState.updated = updatedFile
- log.Println("build stream - Plan file result:")
+ log.Println("build stream - Plan file result:", planFileResult != nil)
log.Printf("updatedFile exists: %v\n", updatedFile != "")
- log.Printf("toVerifyPlanFileResult exists: %v\n", planFileResult != nil)
fileState.onFinishBuildFile(planFileResult, updatedFile)
return
diff --git a/app/server/model/plan/build_verify_state.go b/app/server/model/plan/build_verify_state.go
index c733db98..b0306d6d 100644
--- a/app/server/model/plan/build_verify_state.go
+++ b/app/server/model/plan/build_verify_state.go
@@ -131,7 +131,7 @@ func (fileState *activeBuildStreamFileState) MarkLatestResultVerified(passed boo
}
}
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
}
diff --git a/app/server/model/plan/state.go b/app/server/model/plan/state.go
index 7ffba784..1d7aa62b 100644
--- a/app/server/model/plan/state.go
+++ b/app/server/model/plan/state.go
@@ -101,7 +101,7 @@ func DeleteActivePlan(orgId, userId, planId, branch string) {
} else {
defer func() {
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo for plan %s: %v\n", planId, err)
}
diff --git a/app/server/model/plan/tell_load.go b/app/server/model/plan/tell_load.go
index 4dcd69ad..2e09ad71 100644
--- a/app/server/model/plan/tell_load.go
+++ b/app/server/model/plan/tell_load.go
@@ -257,7 +257,7 @@ func (state *activeTellStreamState) loadTellPlan() error {
}
}
- err = db.UnlockRepo(repoLockId)
+ err = db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
active.StreamDoneCh <- &shared.ApiError{
diff --git a/app/server/model/plan/tell_stream.go b/app/server/model/plan/tell_stream.go
index 7bb8e425..62ea23b8 100644
--- a/app/server/model/plan/tell_stream.go
+++ b/app/server/model/plan/tell_stream.go
@@ -126,6 +126,54 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
currentReply: active.CurrentReplyContent,
}, active.SummaryCtx)
+ var generatedDescription *db.ConvoMessageDescription
+ var shouldContinue bool
+ var nextTask string
+ var errCh = make(chan error, 2)
+
+ go func() {
+ if len(replyFiles) > 0 {
+ log.Println("Generating plan description")
+
+ envVar := settings.ModelPack.CommitMsg.BaseModelConfig.ApiKeyEnvVar
+ client := clients[envVar]
+
+ res, err := genPlanDescription(client, settings.ModelPack.CommitMsg, planId, branch, active.Ctx)
+ if err != nil {
+ errCh <- fmt.Errorf("failed to generate plan description: %v", err)
+ return
+ }
+
+ generatedDescription = res
+ generatedDescription.OrgId = currentOrgId
+ generatedDescription.SummarizedToMessageId = summarizedToMessageId
+ generatedDescription.MadePlan = true
+ generatedDescription.Files = replyFiles
+ }
+ errCh <- nil
+ }()
+
+ go func() {
+ log.Println("Getting exec status")
+ shouldContinue, nextTask, err = state.execStatusShouldContinue(active.CurrentReplyContent, latestSummaryCh, active.Ctx)
+ if err != nil {
+ errCh <- fmt.Errorf("failed to get exec status: %v", err)
+ return
+ }
+
+ log.Printf("Should continue: %v\n", shouldContinue)
+
+ errCh <- nil
+ }()
+
+ for i := 0; i < 2; i++ {
+ err := <-errCh
+ if err != nil {
+ state.onError(err, true, "", "")
+ return
+ }
+ }
+
log.Println("Locking repo to store assistant reply and description")
repoLockId, err := db.LockRepo(
@@ -152,8 +200,6 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
log.Println("Locked repo for assistant reply and description")
- var shouldContinue bool
- var nextTask string
err = func() error {
defer func() {
if err != nil {
@@ -166,7 +212,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
log.Println("Unlocking repo for assistant reply and description")
- err = db.UnlockRepo(repoLockId)
+ err = db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
active.StreamDoneCh <- &shared.ApiError{
@@ -184,77 +230,32 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
return err
}
- var description *db.ConvoMessageDescription
+ log.Println("getting description for assistant message: ", assistantMsg.Id)
- errCh := make(chan error, 2)
-
- go func() {
- log.Println("getting description")
- log.Println("getting description for assistant message: ", assistantMsg.Id)
-
- if len(replyFiles) == 0 {
- description = &db.ConvoMessageDescription{
- OrgId: currentOrgId,
- PlanId: planId,
- ConvoMessageId: assistantMsg.Id,
- SummarizedToMessageId: summarizedToMessageId,
- BuildPathsInvalidated: map[string]bool{},
- MadePlan: false,
- }
- } else {
- log.Println("Generating plan description")
-
- envVar := settings.ModelPack.CommitMsg.BaseModelConfig.ApiKeyEnvVar
- client := clients[envVar]
-
- description, err = genPlanDescription(client, settings.ModelPack.CommitMsg, planId, branch, active.Ctx)
- if err != nil {
- state.onError(fmt.Errorf("failed to generate plan description: %v", err), true, assistantMsg.Id, convoCommitMsg)
- return
- }
-
- description.OrgId = currentOrgId
- description.ConvoMessageId = assistantMsg.Id
- description.SummarizedToMessageId = summarizedToMessageId
- description.MadePlan = true
- description.Files = replyFiles
- }
-
- log.Println("Storing description")
- err = db.StoreDescription(description)
-
- if err != nil {
- state.onError(fmt.Errorf("failed to store description: %v", err), false, assistantMsg.Id, convoCommitMsg)
- errCh <- err
- return
- }
-
- log.Println("Description stored")
- // spew.Dump(description)
-
- errCh <- nil
- }()
-
- go func() {
- log.Println("Getting exec status")
- shouldContinue, nextTask, err = state.execStatusShouldContinue(assistantMsg.Message, latestSummaryCh, active.Ctx)
- if err != nil {
- state.onError(fmt.Errorf("failed to get exec status: %v", err), false, assistantMsg.Id, convoCommitMsg)
- errCh <- err
- return
+ var description *db.ConvoMessageDescription
+ if len(replyFiles) == 0 {
+ description = &db.ConvoMessageDescription{
+ OrgId: currentOrgId,
+ PlanId: planId,
+ ConvoMessageId: assistantMsg.Id,
+ SummarizedToMessageId: summarizedToMessageId,
+ BuildPathsInvalidated: map[string]bool{},
+ MadePlan: false,
}
+ } else {
+ description = generatedDescription
+ description.ConvoMessageId = assistantMsg.Id
+ }
- log.Printf("Should continue: %v\n", shouldContinue)
+ log.Println("Storing description")
+ err = db.StoreDescription(description)
- errCh <- nil
- }()
-
- for i := 0; i < 2; i++ {
- err = <-errCh
- if err != nil {
- return err
- }
+ if err != nil {
+ state.onError(fmt.Errorf("failed to store description: %v", err), false, assistantMsg.Id, convoCommitMsg)
+ return err
}
+ log.Println("Description stored")
+ // spew.Dump(description)
log.Println("Comitting reply message and description")
@@ -263,7 +264,6 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt
state.onError(fmt.Errorf("failed to commit: %v", err), false, assistantMsg.Id, convoCommitMsg)
return err
}
-
log.Println("Assistant reply and description committed")
return nil
@@ -585,7 +585,7 @@ func (state *activeTellStreamState) onError(streamErr error, storeDesc bool, con
} else {
defer func() {
- err := db.UnlockRepo(repoLockId)
+ err := db.DeleteRepoLock(repoLockId)
if err != nil {
log.Printf("Error unlocking repo for plan %s: %v\n", planId, err)
}