diff options
| -rw-r--r-- | weed/command/filer_copy.go | 5 | ||||
| -rw-r--r-- | weed/mq/broker/broker_grpc_lookup.go | 5 | ||||
| -rw-r--r-- | weed/s3api/s3api_objects_list_handlers.go | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index 4cef053fc..e1a8999f3 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -46,6 +46,7 @@ type CopyOptions struct { ttlSec int32 checkSize *bool verbose *bool + volumeServerAccess *string } func init() { @@ -61,6 +62,7 @@ func init() { copy.concurrentChunks = cmdFilerCopy.Flag.Int("concurrentChunks", 8, "concurrent chunk copy goroutines for each file") copy.checkSize = cmdFilerCopy.Flag.Bool("check.size", false, "copy when the target file size is different from the source file") copy.verbose = cmdFilerCopy.Flag.Bool("verbose", false, "print out details during copying") + copy.volumeServerAccess = cmdMount.Flag.String("volumeServerAccess", "direct", "access volume servers by [direct|publicUrl|filerProxy]") } var cmdFilerCopy = &Command{ @@ -580,6 +582,9 @@ func (worker *FileCopyWorker) WithFilerClient(streamingMode bool, fn func(filer_ } func (worker *FileCopyWorker) AdjustedUrl(location *filer_pb.Location) string { + if *worker.options.volumeServerAccess == "publicUrl" { + return location.PublicUrl + } return location.Url } diff --git a/weed/mq/broker/broker_grpc_lookup.go b/weed/mq/broker/broker_grpc_lookup.go index 4e9c9e441..ac13a7581 100644 --- a/weed/mq/broker/broker_grpc_lookup.go +++ b/weed/mq/broker/broker_grpc_lookup.go @@ -14,9 +14,8 @@ import ( // // 2. find the topic partitions on the filer // 2.1 if the topic is not found, return error -// 2.2 if the request is_for_publish, create the topic -// 2.2.1 if the request is_for_subscribe, return error not found -// 2.2.2 if the request is_for_publish, create the topic +// 2.1.1 if the request is_for_subscribe, return error not found +// 2.1.2 if the request is_for_publish, create the topic // 2.2 if the topic is found, return the brokers // // 3. unlock the topic diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index 8b1776ae6..78b77a044 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -310,7 +310,7 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d return } nextMarker = subDir + "/" + subNextMarker - // finished processing this sub directory + // finished processing this subdirectory marker = subDir } if cursor.isTruncated { |