[Carry 2337] shutdown logger after exit #2621
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fahedouch
changed the title
fahedouch
force-pushed
the
carry-shutdown-logger-after-exit
branch
2 times, most recently
from
46fe32b
to
10676af
Compare
This shouldn't be a separate commit |
fahedouch
force-pushed
the
carry-shutdown-logger-after-exit
branch
2 times, most recently
from
f351d2e
to
f2a16e4
Compare
@AkihiroSuda is it better now ? |
|
The commit message isn't still really descriptive |
AkihiroSuda
reviewed
Nov 6, 2023
AkihiroSuda
reviewed
Nov 6, 2023
pkg/logging/logging.go
Outdated
| @@ -207,7 +208,7 @@ func loggingProcessAdapter(ctx context.Context, driver Driver, dataStore, hostAd | |||
| buf := make([]byte, 32<<10) | |||
| _, err := io.CopyBuffer(writer, reader, buf) | |||
| if err != nil { | |||
| logrus.Errorf("failed to copy stream: %s", err) | |||
| log.L.Errorf("failed to copy stream: %v", err) | |||
There was a problem hiding this comment.
This should meld into the carried commit so that the carried commit is still compilable
fahedouch
force-pushed
the
carry-shutdown-logger-after-exit
branch
3 times, most recently
from
d6055c3
to
193c92b
Compare
AkihiroSuda
requested changes
Nov 14, 2023
There was a problem hiding this comment.
Still contains uncompilable commits
$ git checkout a234c8eab60db7b5a0d2933729c9035ae66fa0e4
$ make
GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w -X github.com/containerd/nerdctl/pkg/version.Version=v1.7.0-10-ga234c8ea -X github.com/containerd/nerdctl/pkg/version.Revision=a234c8eab60db7b5a0d2933729c9035ae66fa0e4" -o /home/suda/gopath/src/github.com/containerd/nerdctl/_output/nerdctl github.com/containerd/nerdctl/cmd/nerdctl
# github.com/containerd/nerdctl/pkg/logging
pkg/logging/logging.go:179:4: undefined: logrus
make: *** [Makefile:57: nerdctl] Error 1
AkihiroSuda
reviewed
Nov 14, 2023
pkg/logging/logging.go
Outdated
| // the logger will obtain an exclusive lock on a file until the container is | ||
| // stopped and the driver has finished processing all output, | ||
| // so that waiting log viewers can be signalled when the process is complete. | ||
| return lockutil.WithDirLock(loggerLock, func() error { |
There was a problem hiding this comment.
Why ? could you be more explicit please?
There was a problem hiding this comment.
loggerLock doesn't seem to be a dir
fahedouch
force-pushed
the
carry-shutdown-logger-after-exit
branch
11 times, most recently
from
41e8522
to
c322829
Compare
Signed-off-by: Mrudul Harwani <mharwani@amazon.com> fixes to squash Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com> fixes to squash Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
Signed-off-by: Mrudul Harwani <mharwani@amazon.com>
…ocessed data Signed-off-by: Mrudul Harwani <mharwani@amazon.com>
Signed-off-by: Mrudul Harwani <mharwani@amazon.com>
…thLock Signed-off-by: Mrudul Harwani <mharwani@amazon.com>
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
fahedouch
force-pushed
the
carry-shutdown-logger-after-exit
branch
from
10132ee
to
21730db
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
carry #2337 ( originally created by @mharwani)