Skip to content

[supervisor] improve docker activation #18143

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 11, 2023
Merged

[supervisor] improve docker activation #18143

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a14c52
[supervisor] fix leaking docker sockets
akosyakov Jul 4, 2023
6a87b03
[supervisor] remote outcome for gitpod_activate_docker
akosyakov Jul 4, 2023
95aa393
[supervisor] don't log expected docker activation socket errors
akosyakov Jul 4, 2023
6eb74b7
[supervisor] add max retries on exit code errors
akosyakov Jul 4, 2023
4a6265b
only notification if not in headless and logFile successful created
iQQBot Jul 6, 2023
b7b98d4
move retry logic to listener
iQQBot Jul 6, 2023
2856e94
change max retry attempts
iQQBot Jul 6, 2023
5264444
ignore canceled error
iQQBot Jul 6, 2023
71ff74e
add sleep
iQQBot Jul 6, 2023
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
2 changes: 1 addition & 1 deletion components/supervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ require (
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
github.com/improbable-eng/grpc-web v0.14.0
github.com/mailru/easygo v0.0.0-20190618140210-3c14a0dc985f
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.42.0
Expand Down Expand Up @@ -116,6 +115,7 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/moredure/easygo v0.0.0-20220122214504-21cd2ebdd15b
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runtime-spec v1.0.2 // indirect
Expand Down
6 changes: 2 additions & 4 deletions components/supervisor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions components/supervisor/pkg/activation/activation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import (
"os"
"sync"

"github.com/mailru/easygo/netpoll"
"github.com/gitpod-io/gitpod/common-go/log"
"github.com/moredure/easygo/netpoll"
"golang.org/x/xerrors"
)

Expand All @@ -19,16 +20,22 @@ type Callback func(socketFD *os.File) error

// Listen polls on the listener and calls callback when someone writes to it.
func Listen(ctx context.Context, l net.Listener, activate Callback) error {
poller, err := netpoll.New(nil)
poller, err := netpoll.New(&netpoll.Config{
OnWaitError: func(err error) {
log.WithError(err).Error("netpoll: wait loop error")
},
})
if err != nil {
return err
}
defer poller.Close()

// Get netpoll descriptor with EventRead|EventEdgeTriggered.
desc, err := netpoll.HandleListener(l, netpoll.EventRead|netpoll.EventEdgeTriggered)
if err != nil {
return err
}
defer desc.Close()

var (
runc = make(chan bool, 1)
Expand Down
11 changes: 5 additions & 6 deletions components/supervisor/pkg/supervisor/supervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import (
"github.com/gitpod-io/gitpod/common-go/analytics"
"github.com/gitpod-io/gitpod/common-go/log"
"github.com/gitpod-io/gitpod/common-go/pprof"
"github.com/gitpod-io/gitpod/common-go/process"
csapi "github.com/gitpod-io/gitpod/content-service/api"
"github.com/gitpod-io/gitpod/content-service/pkg/executor"
"github.com/gitpod-io/gitpod/content-service/pkg/git"
Expand Down Expand Up @@ -1575,17 +1576,12 @@ func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *te
},
LogToStdout: true,
})
outcome := "success"
if err != nil {
outcome = "failure"
}
w.Track(analytics.TrackMessage{
Identity: analytics.Identity{UserID: cfg.OwnerId},
Event: "gitpod_activate_docker",
Properties: map[string]interface{}{
"instanceId": cfg.WorkspaceInstanceID,
"workspaceId": cfg.WorkspaceID,
"outcome": outcome,
"debugWorkspace": cfg.isDebugWorkspace(),
},
})
Expand All @@ -1608,7 +1604,10 @@ func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *te
cancel()
return err
})
if err != nil && !errors.Is(err, context.Canceled) && err.Error() != "signal: killed" {
if err != nil &&
!errors.Is(err, context.Canceled) &&
!process.IsNotChildProcess(err) &&
!strings.Contains(err.Error(), "signal: ") {
log.WithError(err).Error("cannot provide Docker activation socket")
}
}
Expand Down