diff options
| author | chrislu <chris.lu@gmail.com> | 2024-03-21 23:24:28 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-03-21 23:24:28 -0700 |
| commit | 36a3301e0cf2e4578561d983c315a34fbac264b0 (patch) | |
| tree | d8a6d268ec18586e47c8d490339978422d255364 | |
| parent | da31e9b939ed38fdd7c053eeaa9a7da06c5c936f (diff) | |
| parent | 5c0fcae039f856aa4bbc4b21ffc0910b20254444 (diff) | |
| download | seaweedfs-36a3301e0cf2e4578561d983c315a34fbac264b0.tar.xz seaweedfs-36a3301e0cf2e4578561d983c315a34fbac264b0.zip | |
Merge branch 'master' into mq-subscribe
| -rw-r--r-- | weed/iamapi/iamapi_management_handlers.go | 4 | ||||
| -rw-r--r-- | weed/util/log_buffer/log_read.go | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go index be9e4f874..d63bc8849 100644 --- a/weed/iamapi/iamapi_management_handlers.go +++ b/weed/iamapi/iamapi_management_handlers.go @@ -3,6 +3,7 @@ package iamapi import ( "crypto/sha1" "encoding/json" + "errors" "fmt" "math/rand" "net/http" @@ -13,6 +14,7 @@ import ( "time" "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/iam_pb" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" @@ -424,7 +426,7 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) { } values := r.PostForm s3cfg := &iam_pb.S3ApiConfiguration{} - if err := iama.s3ApiConfig.GetS3ApiConfiguration(s3cfg); err != nil { + if err := iama.s3ApiConfig.GetS3ApiConfiguration(s3cfg); err != nil && !errors.Is(err, filer_pb.ErrNotFound) { s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } diff --git a/weed/util/log_buffer/log_read.go b/weed/util/log_buffer/log_read.go index 29ac88b18..c3dd0f288 100644 --- a/weed/util/log_buffer/log_read.go +++ b/weed/util/log_buffer/log_read.go @@ -40,7 +40,7 @@ func (logBuffer *LogBuffer) LoopProcessLogData(readerName string, startPosition if bytesBuf != nil { logBuffer.ReleaseMemory(bytesBuf) } - println("LoopProcessLogData", readerName, "sent messages total", entryCounter) + // println("LoopProcessLogData", readerName, "sent messages total", entryCounter) }() for { @@ -105,7 +105,7 @@ func (logBuffer *LogBuffer) LoopProcessLogData(readerName string, startPosition } if stopTsNs != 0 && logEntry.TsNs > stopTsNs { isDone = true - println("stopTsNs", stopTsNs, "logEntry.TsNs", logEntry.TsNs) + // println("stopTsNs", stopTsNs, "logEntry.TsNs", logEntry.TsNs) return } lastReadPosition = NewMessagePosition(logEntry.TsNs, batchIndex) @@ -125,7 +125,7 @@ func (logBuffer *LogBuffer) LoopProcessLogData(readerName string, startPosition } - glog.V(0).Infof("%s sent messages ts[%+v,%+v] size %d\n", readerName, startPosition, lastReadPosition, batchSize) + glog.V(4).Infof("%s sent messages ts[%+v,%+v] size %d\n", readerName, startPosition, lastReadPosition, batchSize) } } |