Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OD sigterm race condition fix #544

Merged
merged 27 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
NikitaUnisikhin committed Nov 20, 2023
commit 46ad3e7979b5c620ea8cfba11025d0128c35852e
8 changes: 4 additions & 4 deletions docker/ody-integration-test/pkg/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ func main() {
ctx := context.Background()

for _, f := range []func(ctx2 context.Context) error{
// odyClientServerInteractionsTestSet,
// odyPkgSyncTestSet,
// odyShowErrsTestSet,
// odySignalsTestSet,
odyClientServerInteractionsTestSet,
odyPkgSyncTestSet,
odyShowErrsTestSet,
odySignalsTestSet,
odyCoresTestSet,
} {
err := f(ctx)
Expand Down
12 changes: 1 addition & 11 deletions docker/ody-integration-test/pkg/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,7 @@ func ensurePostgresqlRunning(ctx context.Context) error {

func ensureOdysseyRunning(ctx context.Context) error {
fmt.Printf("ensuring odyssey is OK or not\n")
cmd := exec.CommandContext(ctx, startOdysseyCmd)

outfile, err := os.Create("./od_err_log.txt")
if err != nil {
panic(err)
}
defer outfile.Close()
cmd.Stderr = outfile

err = cmd.Run()

_, err := exec.CommandContext(ctx, startOdysseyCmd).Output()
if err != nil {
err = fmt.Errorf("error due odyssey restarting %w", err)
fmt.Println(err)
Expand Down
1 change: 0 additions & 1 deletion docker/odyssey.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ database default {
unix_socket_dir "/tmp"
unix_socket_mode "0644"

log_file "/var/log/odyssey.log"
log_format "%p %t %l [%i %s] (%c) %m\n"
log_debug no
log_config yes
Expand Down
Loading