From 785223e587fea23508f5bd304749b45a0e56430b Mon Sep 17 00:00:00 2001 From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:05:29 +0500 Subject: [PATCH 1/2] rabbitpubsub enable durable --- weed/replication/sub/notification_gocdk_pub_sub.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/weed/replication/sub/notification_gocdk_pub_sub.go b/weed/replication/sub/notification_gocdk_pub_sub.go index cb690e3ce..ad4031190 100644 --- a/weed/replication/sub/notification_gocdk_pub_sub.go +++ b/weed/replication/sub/notification_gocdk_pub_sub.go @@ -46,17 +46,17 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str } defer ch.Close() if err := ch.ExchangeDeclare( - exchangeNameDLX, "fanout", false, false, false, false, nil); err != nil { + exchangeNameDLX, "fanout", true, false, false, false, nil); err != nil { glog.Error(err) return err } if err := ch.ExchangeDeclare( - exchangeName, "fanout", false, false, false, false, nil); err != nil { + exchangeName, "fanout", true, false, false, false, nil); err != nil { glog.Error(err) return err } if _, err := ch.QueueDeclare( - queueName, false, false, false, false, + queueName, true, false, false, false, amqp.Table{"x-dead-letter-exchange": exchangeNameDLX}); err != nil { glog.Error(err) return err @@ -66,7 +66,7 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str return err } if _, err := ch.QueueDeclare( - queueNameDLX, false, false, false, false, + queueNameDLX, true, false, false, false, amqp.Table{"x-dead-letter-exchange": exchangeName, "x-message-ttl": 600000}); err != nil { glog.Error(err) return err From 69ef6459c30a9146e815ba0d04fd59f8d9eabdc4 Mon Sep 17 00:00:00 2001 From: chrislu Date: Wed, 6 Jul 2022 02:28:34 -0700 Subject: [PATCH 2/2] S3 ListObjectsV2 fix pagination under bucket root fix https://github.com/chrislusf/seaweedfs/issues/3166 --- weed/s3api/s3api_objects_list_handlers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index 1c55f97ac..e55802937 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -281,7 +281,7 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d request := &filer_pb.ListEntriesRequest{ Directory: dir, Prefix: prefix, - Limit: uint32(maxKeys + 1), + Limit: uint32(maxKeys + 2), // bucket root directory needs to skip additional s3_constants.MultipartUploadsFolder folder StartFromFileName: marker, InclusiveStartFrom: inclusiveStartFrom, }