diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/mq/broker/broker_grpc_configure.go | 3 | ||||
| -rw-r--r-- | weed/mq/broker/broker_grpc_sub_coordinator.go | 3 | ||||
| -rw-r--r-- | weed/s3api/chunked_reader_v4.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_fs_configure.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_s3_circuitbreaker.go | 11 | ||||
| -rw-r--r-- | weed/shell/command_s3_clean_uploads.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_s3_configure.go | 2 | ||||
| -rw-r--r-- | weed/storage/disk_location.go | 2 |
8 files changed, 15 insertions, 12 deletions
diff --git a/weed/mq/broker/broker_grpc_configure.go b/weed/mq/broker/broker_grpc_configure.go index 6130a8598..f827f0b37 100644 --- a/weed/mq/broker/broker_grpc_configure.go +++ b/weed/mq/broker/broker_grpc_configure.go @@ -3,6 +3,7 @@ package broker import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/mq/pub_balancer" "github.com/seaweedfs/seaweedfs/weed/mq/topic" @@ -57,7 +58,7 @@ func (b *MessageQueueBroker) ConfigureTopic(ctx context.Context, request *mq_pb. } resp = &mq_pb.ConfigureTopicResponse{} if b.PubBalancer.Brokers.IsEmpty() { - return nil, status.Errorf(codes.Unavailable, pub_balancer.ErrNoBroker.Error()) + return nil, status.Errorf(codes.Unavailable, "no broker available: %v", pub_balancer.ErrNoBroker) } resp.BrokerPartitionAssignments = pub_balancer.AllocateTopicPartitions(b.PubBalancer.Brokers, request.PartitionCount) resp.RecordType = request.RecordType diff --git a/weed/mq/broker/broker_grpc_sub_coordinator.go b/weed/mq/broker/broker_grpc_sub_coordinator.go index 90253b892..985b0a47e 100644 --- a/weed/mq/broker/broker_grpc_sub_coordinator.go +++ b/weed/mq/broker/broker_grpc_sub_coordinator.go @@ -2,6 +2,7 @@ package broker import ( "context" + "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/mq/sub_coordinator" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" @@ -26,7 +27,7 @@ func (b *MessageQueueBroker) SubscriberToSubCoordinator(stream mq_pb.SeaweedMess if initMessage != nil { cg, cgi, err = b.SubCoordinator.AddSubscriber(initMessage) if err != nil { - return status.Errorf(codes.InvalidArgument, err.Error()) + return status.Errorf(codes.InvalidArgument, "failed to add subscriber: %v", err) } glog.V(0).Infof("subscriber %s/%s/%s connected", initMessage.ConsumerGroup, initMessage.ConsumerGroupInstanceId, initMessage.Topic) } else { diff --git a/weed/s3api/chunked_reader_v4.go b/weed/s3api/chunked_reader_v4.go index edef5bfaf..a69319500 100644 --- a/weed/s3api/chunked_reader_v4.go +++ b/weed/s3api/chunked_reader_v4.go @@ -378,7 +378,7 @@ func (cr *s3ChunkedReader) Read(buf []byte) (n int, err error) { if extractedCheckSumAlgorithm.String() != cr.checkSumAlgorithm { errorMessage := fmt.Sprintf("checksum algorithm in trailer '%s' does not match the one advertised in the header '%s'", extractedCheckSumAlgorithm.String(), cr.checkSumAlgorithm) - glog.V(3).Infof(errorMessage) + glog.V(3).Info(errorMessage) cr.err = errors.New(errorMessage) return 0, cr.err } diff --git a/weed/shell/command_fs_configure.go b/weed/shell/command_fs_configure.go index 35f49688d..c27c6c7b5 100644 --- a/weed/shell/command_fs_configure.go +++ b/weed/shell/command_fs_configure.go @@ -136,7 +136,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io var buf2 bytes.Buffer fc.ToText(&buf2) - fmt.Fprintf(writer, string(buf2.Bytes())) + fmt.Fprint(writer, buf2.String()) fmt.Fprintln(writer) if *apply { diff --git a/weed/shell/command_s3_circuitbreaker.go b/weed/shell/command_s3_circuitbreaker.go index 5abc2d429..43ff454f7 100644 --- a/weed/shell/command_s3_circuitbreaker.go +++ b/weed/shell/command_s3_circuitbreaker.go @@ -4,13 +4,14 @@ import ( "bytes" "flag" "fmt" - "github.com/seaweedfs/seaweedfs/weed/filer" - "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" - "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "io" "strconv" "strings" + "github.com/seaweedfs/seaweedfs/weed/filer" + "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" ) @@ -180,8 +181,8 @@ func (c *commandS3CircuitBreaker) Do(args []string, commandEnv *CommandEnv, writ return err } - _, _ = fmt.Fprintf(writer, string(buf.Bytes())) - _, _ = fmt.Fprintln(writer) + fmt.Fprint(writer, buf.String()) + fmt.Fprintln(writer) if *apply { if err := commandEnv.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { diff --git a/weed/shell/command_s3_clean_uploads.go b/weed/shell/command_s3_clean_uploads.go index aa296dd67..bfce5d54d 100644 --- a/weed/shell/command_s3_clean_uploads.go +++ b/weed/shell/command_s3_clean_uploads.go @@ -64,7 +64,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer for _, bucket := range buckets { if err := c.cleanupUploads(commandEnv, writer, filerBucketsPath, bucket, *uploadedTimeAgo, signingKey); err != nil { - fmt.Fprintf(writer, fmt.Sprintf("failed cleanup uploads for bucket %s: %v", bucket, err)) + fmt.Fprintf(writer, "failed cleanup uploads for bucket %s: %v", bucket, err) } } diff --git a/weed/shell/command_s3_configure.go b/weed/shell/command_s3_configure.go index 0726bd143..478d62a6d 100644 --- a/weed/shell/command_s3_configure.go +++ b/weed/shell/command_s3_configure.go @@ -176,7 +176,7 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io buf.Reset() filer.ProtoToText(&buf, s3cfg) - fmt.Fprintf(writer, string(buf.Bytes())) + fmt.Fprint(writer, buf.String()) fmt.Fprintln(writer) if *apply { diff --git a/weed/storage/disk_location.go b/weed/storage/disk_location.go index 47f1b3d6f..cc89c4ca1 100644 --- a/weed/storage/disk_location.go +++ b/weed/storage/disk_location.go @@ -290,7 +290,7 @@ func (l *DiskLocation) DeleteCollectionFromDiskLocation(collection string) (e er errBuilder.WriteString("; ") } if errBuilder.Len() > 0 { - e = fmt.Errorf(errBuilder.String()) + e = fmt.Errorf("%s", errBuilder.String()) } return |