diff options
43 files changed, 112 insertions, 98 deletions
diff --git a/.github/workflows/binaries_dev.yml b/.github/workflows/binaries_dev.yml index 778c25fc9..621a61b78 100644 --- a/.github/workflows/binaries_dev.yml +++ b/.github/workflows/binaries_dev.yml @@ -53,7 +53,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed-large-disk @@ -68,7 +68,7 @@ jobs: release_tag: dev overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed-normal-disk @@ -102,7 +102,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed-large-disk @@ -117,7 +117,7 @@ jobs: release_tag: dev overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed-normal-disk diff --git a/.github/workflows/binaries_release0.yml b/.github/workflows/binaries_release0.yml index e036936bb..0acb66b2c 100644 --- a/.github/workflows/binaries_release0.yml +++ b/.github/workflows/binaries_release0.yml @@ -38,7 +38,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -52,7 +52,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/.github/workflows/binaries_release1.yml b/.github/workflows/binaries_release1.yml index 15b9529a5..b9dd7b5d7 100644 --- a/.github/workflows/binaries_release1.yml +++ b/.github/workflows/binaries_release1.yml @@ -38,7 +38,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -52,7 +52,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/.github/workflows/binaries_release2.yml b/.github/workflows/binaries_release2.yml index e5c479307..b2bd0964d 100644 --- a/.github/workflows/binaries_release2.yml +++ b/.github/workflows/binaries_release2.yml @@ -38,7 +38,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -52,7 +52,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/.github/workflows/binaries_release3.yml b/.github/workflows/binaries_release3.yml index 048ea36bf..e4da95b8c 100644 --- a/.github/workflows/binaries_release3.yml +++ b/.github/workflows/binaries_release3.yml @@ -38,7 +38,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -52,7 +52,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/.github/workflows/binaries_release4.yml b/.github/workflows/binaries_release4.yml index 7ebbceff3..95be8d45f 100644 --- a/.github/workflows/binaries_release4.yml +++ b/.github/workflows/binaries_release4.yml @@ -39,7 +39,7 @@ jobs: build_flags: -tags elastic,gocdk,rclone,sqlite,tarantool,tikv,ydb pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -53,7 +53,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset,elastic,gocdk,rclone,sqlite,tarantool,tikv,ydb - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/.github/workflows/binaries_release5.yml b/.github/workflows/binaries_release5.yml index db7a28f51..4d7c0773e 100644 --- a/.github/workflows/binaries_release5.yml +++ b/.github/workflows/binaries_release5.yml @@ -38,7 +38,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 # build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed @@ -52,7 +52,7 @@ jobs: overwrite: true pre_command: export CGO_ENABLED=0 && export GODEBUG=http2client=0 build_flags: -tags 5BytesOffset # optional, default is - ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=${{github.sha}} + ldflags: -s -w -extldflags -static -X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=${{github.sha}} # Where to run `go build .` project_path: weed binary_name: weed diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index e53a03426..a52e74143 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -6,7 +6,7 @@ ARG BRANCH=${BRANCH:-master} ARG TAGS RUN cd /go/src/github.com/seaweedfs/seaweedfs && git checkout $BRANCH RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed \ - && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(git rev-parse --short HEAD)" \ && CGO_ENABLED=0 go install -tags "$TAGS" -ldflags "-extldflags -static ${LDFLAGS}" FROM alpine AS final diff --git a/docker/Dockerfile.rocksdb_large b/docker/Dockerfile.rocksdb_large index 33a64331b..706cd15ea 100644 --- a/docker/Dockerfile.rocksdb_large +++ b/docker/Dockerfile.rocksdb_large @@ -21,7 +21,7 @@ RUN git clone https://github.com/seaweedfs/seaweedfs /go/src/github.com/seaweedf ARG BRANCH=${BRANCH:-master} RUN cd /go/src/github.com/seaweedfs/seaweedfs && git checkout $BRANCH RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed \ - && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(git rev-parse --short HEAD)" \ && go install -tags "5BytesOffset rocksdb" -ldflags "-extldflags -static ${LDFLAGS}" diff --git a/docker/Dockerfile.rocksdb_large_local b/docker/Dockerfile.rocksdb_large_local index 989bf3a10..b3b08dd0c 100644 --- a/docker/Dockerfile.rocksdb_large_local +++ b/docker/Dockerfile.rocksdb_large_local @@ -5,7 +5,7 @@ RUN mkdir -p /go/src/github.com/seaweedfs/ ADD . /go/src/github.com/seaweedfs/seaweedfs RUN ls -al /go/src/github.com/seaweedfs/ && \ cd /go/src/github.com/seaweedfs/seaweedfs/weed \ - && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(git rev-parse --short HEAD)" \ && go install -tags "5BytesOffset rocksdb" -ldflags "-extldflags -static ${LDFLAGS}" diff --git a/docker/Makefile b/docker/Makefile index a4f207c89..777357758 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -7,7 +7,7 @@ gen: dev cgo ?= 0 binary: export SWCOMMIT=$(shell git rev-parse --short HEAD) - export SWLDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(SWCOMMIT)" + export SWLDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(SWCOMMIT)" cd ../weed && CGO_ENABLED=$(cgo) GOOS=linux go build $(options) -tags "$(tags)" -ldflags "-s -w -extldflags -static $(SWLDFLAGS)" && mv weed ../docker/ cd ../other/mq_client_example/agent_pub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv agent_pub_record ../../../docker/ cd ../other/mq_client_example/agent_sub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv agent_sub_record ../../../docker/ diff --git a/weed/command/benchmark.go b/weed/command/benchmark.go index 715ae3d67..e0cb31437 100644 --- a/weed/command/benchmark.go +++ b/weed/command/benchmark.go @@ -5,6 +5,7 @@ import ( "context" "fmt" "github.com/seaweedfs/seaweedfs/weed/pb" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io" "math" "math/rand" @@ -115,7 +116,7 @@ func runBenchmark(cmd *Command, args []string) bool { util.LoadSecurityConfiguration() b.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client") - fmt.Printf("This is SeaweedFS version %s %s %s\n", util.Version(), runtime.GOOS, runtime.GOARCH) + fmt.Printf("This is SeaweedFS version %s %s %s\n", version.Version(), runtime.GOOS, runtime.GOARCH) if *b.maxCpu < 1 { *b.maxCpu = runtime.NumCPU() } diff --git a/weed/command/filer.go b/weed/command/filer.go index 05b1e88c7..aa4f878ad 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net" "net/http" "os" @@ -329,7 +330,7 @@ func (fo *FilerOptions) startFiler() { if *fo.publicPort != 0 { publicListeningAddress := util.JoinHostPort(*fo.bindIp, *fo.publicPort) - glog.V(0).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) + glog.V(0).Infoln("Start Seaweed filer server", version.Version(), "public at", publicListeningAddress) publicListener, localPublicListener, e := util.NewIpAndLocalListeners(*fo.bindIp, *fo.publicPort, 0) if e != nil { glog.Fatalf("Filer server public listener error on port %d:%v", *fo.publicPort, e) @@ -348,7 +349,7 @@ func (fo *FilerOptions) startFiler() { } } - glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port) + glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", version.Version(), *fo.ip, *fo.port) filerListener, filerLocalListener, e := util.NewIpAndLocalListeners( *fo.bindIp, *fo.port, time.Duration(10)*time.Second, diff --git a/weed/command/iam.go b/weed/command/iam.go index f4a7df2ca..b0b0fc52a 100644 --- a/weed/command/iam.go +++ b/weed/command/iam.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "time" @@ -89,7 +90,7 @@ func (iamopt *IamOptions) startIamServer() bool { glog.Fatalf("IAM API Server listener on %s error: %v", listenAddress, err) } - glog.V(0).Infof("Start Seaweed IAM API Server %s at http port %d", util.Version(), *iamopt.port) + glog.V(0).Infof("Start Seaweed IAM API Server %s at http port %d", version.Version(), *iamopt.port) if iamApiLocalListener != nil { go func() { if err = httpS.Serve(iamApiLocalListener); err != nil { diff --git a/weed/command/master.go b/weed/command/master.go index 4392c766f..c7b979e05 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "os" "path" @@ -160,7 +161,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), masterPeers) listeningAddress := util.JoinHostPort(*masterOption.ipBind, *masterOption.port) - glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) + glog.V(0).Infof("Start Seaweed Master %s at %s", version.Version(), listeningAddress) masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOption.ipBind, *masterOption.port, 0) if e != nil { glog.Fatalf("Master startup error: %v", e) @@ -211,7 +212,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { protobuf.RegisterRaftServer(grpcS, raftServer) } reflection.Register(grpcS) - glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOption.ipBind, grpcPort) + glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", version.Version(), *masterOption.ipBind, grpcPort) if grpcLocalL != nil { go grpcS.Serve(grpcLocalL) } diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index 504ddb6c3..17beaa7ec 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "time" @@ -119,7 +120,7 @@ func startMasterFollower(masterOptions MasterOptions) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, option, masters) listeningAddress := util.JoinHostPort(*masterOptions.ipBind, *masterOptions.port) - glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) + glog.V(0).Infof("Start Seaweed Master %s at %s", version.Version(), listeningAddress) masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) if e != nil { glog.Fatalf("Master startup error: %v", e) @@ -134,7 +135,7 @@ func startMasterFollower(masterOptions MasterOptions) { grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.master")) master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) - glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOptions.ip, grpcPort) + glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", version.Version(), *masterOptions.ip, grpcPort) if grpcLocalL != nil { go grpcS.Serve(grpcLocalL) } diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 18eb6bcce..84c84b767 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -6,6 +6,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net" "net/http" "os" @@ -290,7 +291,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { } glog.V(0).Infof("mounted %s%s to %v", *option.filer, mountRoot, dir) - glog.V(0).Infof("This is SeaweedFS version %s %s %s", util.Version(), runtime.GOOS, runtime.GOARCH) + glog.V(0).Infof("This is SeaweedFS version %s %s %s", version.Version(), runtime.GOOS, runtime.GOARCH) server.Serve() diff --git a/weed/command/s3.go b/weed/command/s3.go index 4f513a5fa..aa8798eb1 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io/ioutil" "net" "net/http" @@ -339,7 +340,7 @@ func (s3opt *S3Options) startS3Server() bool { glog.Fatalf("error with tls config: %v", err) } if *s3opt.portHttps == 0 { - glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) + glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", version.Version(), *s3opt.port) if s3ApiLocalListener != nil { go func() { if err = httpS.ServeTLS(s3ApiLocalListener, "", ""); err != nil { @@ -351,9 +352,9 @@ func (s3opt *S3Options) startS3Server() bool { glog.Fatalf("S3 API Server Fail to serve: %v", err) } } else { - glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.portHttps) + glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", version.Version(), *s3opt.portHttps) s3ApiListenerHttps, s3ApiLocalListenerHttps, _ := util.NewIpAndLocalListeners( - *s3opt.bindIp, *s3opt.portHttps, time.Duration(*s3opt.idleTimeout)*time.Second) + *s3opt.bindIp, *s3opt.portHttps, time.Duration(*s3opt.idleTimeout)*time.Second) if s3ApiLocalListenerHttps != nil { go func() { if err = httpS.ServeTLS(s3ApiLocalListenerHttps, "", ""); err != nil { @@ -369,7 +370,7 @@ func (s3opt *S3Options) startS3Server() bool { } } if *s3opt.tlsPrivateKey == "" || *s3opt.portHttps > 0 { - glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) + glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", version.Version(), *s3opt.port) if s3ApiLocalListener != nil { go func() { if err = httpS.Serve(s3ApiLocalListener); err != nil { diff --git a/weed/command/sftp.go b/weed/command/sftp.go index 117f01d6e..ed93e44fe 100644 --- a/weed/command/sftp.go +++ b/weed/command/sftp.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net" "os" "runtime" @@ -175,7 +176,7 @@ func (sftpOpt *SftpOptions) startSftpServer() bool { glog.Fatalf("SFTP server listener on %s error: %v", listenAddress, err) } - glog.V(0).Infof("Start Seaweed SFTP Server %s at %s", util.Version(), listenAddress) + glog.V(0).Infof("Start Seaweed SFTP Server %s at %s", version.Version(), listenAddress) if sftpLocalListener != nil { go func() { diff --git a/weed/command/update.go b/weed/command/update.go index bf871d654..b07789264 100644 --- a/weed/command/update.go +++ b/weed/command/update.go @@ -10,6 +10,7 @@ import ( "encoding/hex" "encoding/json" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io" "net/http" "os" @@ -117,7 +118,7 @@ func runUpdate(cmd *Command, args []string) bool { } func downloadRelease(ctx context.Context, target string, ver string) (version string, err error) { - currentVersion := util.VERSION_NUMBER + currentVersion := version.VERSION_NUMBER rel, err := GitHubLatestRelease(ctx, ver, "seaweedfs", "seaweedfs") if err != nil { return "", err diff --git a/weed/command/version.go b/weed/command/version.go index 8e9574691..bbbbbaff0 100644 --- a/weed/command/version.go +++ b/weed/command/version.go @@ -2,9 +2,8 @@ package command import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "runtime" - - "github.com/seaweedfs/seaweedfs/weed/util" ) var cmdVersion = &Command{ @@ -19,6 +18,6 @@ func runVersion(cmd *Command, args []string) bool { cmd.Usage() } - fmt.Printf("version %s %s %s\n", util.Version(), runtime.GOOS, runtime.GOARCH) + fmt.Printf("version %s %s %s\n", version.Version(), runtime.GOOS, runtime.GOARCH) return true } diff --git a/weed/command/volume.go b/weed/command/volume.go index 2389d5561..c8917819b 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -2,6 +2,7 @@ package command import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" httppprof "net/http/pprof" "os" @@ -351,7 +352,7 @@ func (v VolumeServerOptions) startGrpcService(vs volume_server_pb.VolumeServerSe func (v VolumeServerOptions) startPublicHttpService(handler http.Handler) httpdown.Server { publicListeningAddress := util.JoinHostPort(*v.bindIp, *v.publicPort) - glog.V(0).Infoln("Start Seaweed volume server", util.Version(), "public at", publicListeningAddress) + glog.V(0).Infoln("Start Seaweed volume server", version.Version(), "public at", publicListeningAddress) publicListener, e := util.NewListener(publicListeningAddress, time.Duration(*v.idleConnectionTimeout)*time.Second) if e != nil { glog.Fatalf("Volume server listener error:%v", e) @@ -378,7 +379,7 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd } listeningAddress := util.JoinHostPort(*v.bindIp, *v.port) - glog.V(0).Infof("Start Seaweed volume server %s at %s", util.Version(), listeningAddress) + glog.V(0).Infof("Start Seaweed volume server %s at %s", version.Version(), listeningAddress) listener, e := util.NewListener(listeningAddress, time.Duration(*v.idleConnectionTimeout)*time.Second) if e != nil { glog.Fatalf("Volume server listener error:%v", e) diff --git a/weed/command/webdav.go b/weed/command/webdav.go index 02798b9b6..5ad0ca225 100644 --- a/weed/command/webdav.go +++ b/weed/command/webdav.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "os" "os/user" @@ -65,7 +66,7 @@ func runWebDav(cmd *Command, args []string) bool { util.LoadSecurityConfiguration() listenAddress := fmt.Sprintf("%s:%d", *webDavStandaloneOptions.ipBind, *webDavStandaloneOptions.port) - glog.V(0).Infof("Starting Seaweed WebDav Server %s at %s", util.Version(), listenAddress) + glog.V(0).Infof("Starting Seaweed WebDav Server %s at %s", version.Version(), listenAddress) return webDavStandaloneOptions.startWebDav() @@ -136,12 +137,12 @@ func (wo *WebDavOption) startWebDav() bool { } if *wo.tlsPrivateKey != "" { - glog.V(0).Infof("Start Seaweed WebDav Server %s at https %s", util.Version(), listenAddress) + glog.V(0).Infof("Start Seaweed WebDav Server %s at https %s", version.Version(), listenAddress) if err = httpS.ServeTLS(webDavListener, *wo.tlsCertificate, *wo.tlsPrivateKey); err != nil { glog.Fatalf("WebDav Server Fail to serve: %v", err) } } else { - glog.V(0).Infof("Start Seaweed WebDav Server %s at http %s", util.Version(), listenAddress) + glog.V(0).Infof("Start Seaweed WebDav Server %s at http %s", version.Version(), listenAddress) if err = httpS.Serve(webDavListener); err != nil { glog.Fatalf("WebDav Server Fail to serve: %v", err) } diff --git a/weed/mount/weedfs.go b/weed/mount/weedfs.go index 97e9ca30c..2127e4a2b 100644 --- a/weed/mount/weedfs.go +++ b/weed/mount/weedfs.go @@ -3,6 +3,7 @@ package mount import ( "context" "errors" + "github.com/seaweedfs/seaweedfs/weed/util/version" "math/rand" "os" "path" @@ -231,7 +232,7 @@ func (wfs *WFS) ClearCacheDir() { } func (option *Option) setupUniqueCacheDirectory() { - cacheUniqueId := util.Md5String([]byte(option.MountDirectory + string(option.FilerAddresses[0]) + option.FilerMountRootPath + util.Version()))[0:8] + cacheUniqueId := util.Md5String([]byte(option.MountDirectory + string(option.FilerAddresses[0]) + option.FilerMountRootPath + version.Version()))[0:8] option.uniqueCacheDirForRead = path.Join(option.CacheDirForRead, cacheUniqueId) os.MkdirAll(option.uniqueCacheDirForRead, os.FileMode(0777)&^option.Umask) option.uniqueCacheDirForWrite = filepath.Join(path.Join(option.CacheDirForWrite, cacheUniqueId), "swap") diff --git a/weed/remote_storage/s3/s3_storage_client.go b/weed/remote_storage/s3/s3_storage_client.go index cd5ed99fa..48c8acdf9 100644 --- a/weed/remote_storage/s3/s3_storage_client.go +++ b/weed/remote_storage/s3/s3_storage_client.go @@ -2,6 +2,7 @@ package s3 import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io" "reflect" @@ -53,7 +54,7 @@ func (s s3RemoteStorageMaker) Make(conf *remote_pb.RemoteConf) (remote_storage.R sess.Handlers.Sign.PushBackNamed(v4.SignRequestHandler) } sess.Handlers.Build.PushBack(func(r *request.Request) { - r.HTTPRequest.Header.Set("User-Agent", "SeaweedFS/"+util.VERSION_NUMBER) + r.HTTPRequest.Header.Set("User-Agent", "SeaweedFS/"+version.VERSION_NUMBER) }) sess.Handlers.Build.PushFront(skipSha256PayloadSigning) client.conn = s3.New(sess) diff --git a/weed/s3api/stats.go b/weed/s3api/stats.go index 85c0ce65e..2c1d5b5b5 100644 --- a/weed/s3api/stats.go +++ b/weed/s3api/stats.go @@ -1,13 +1,13 @@ package s3api import ( + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "strconv" "time" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" - "github.com/seaweedfs/seaweedfs/weed/util" ) func track(f http.HandlerFunc, action string) http.HandlerFunc { @@ -17,7 +17,7 @@ func track(f http.HandlerFunc, action string) http.HandlerFunc { defer inFlightGauge.Dec() bucket, _ := s3_constants.GetBucketAndObject(r) - w.Header().Set("Server", "SeaweedFS "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+version.VERSION) recorder := stats_collect.NewStatusResponseWriter(w) start := time.Now() f(recorder, r) diff --git a/weed/server/common.go b/weed/server/common.go index 3aeee7752..4041eca51 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" "github.com/google/uuid" + "github.com/seaweedfs/seaweedfs/weed/util/version" "google.golang.org/grpc/metadata" "io" "io/fs" @@ -240,19 +241,19 @@ func parseURLPath(path string) (vid, fid, filename, ext string, isVolumeIdOnly b func statsHealthHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() writeJsonQuiet(w, r, http.StatusOK, m) } func statsCounterHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() m["Counters"] = serverStats writeJsonQuiet(w, r, http.StatusOK, m) } func statsMemoryHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() m["Memory"] = stats.MemStat() writeJsonQuiet(w, r, http.StatusOK, m) } diff --git a/weed/server/filer_grpc_server_admin.go b/weed/server/filer_grpc_server_admin.go index 8b4912258..8e0e5bfbd 100644 --- a/weed/server/filer_grpc_server_admin.go +++ b/weed/server/filer_grpc_server_admin.go @@ -3,6 +3,7 @@ package weed_server import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "time" "github.com/seaweedfs/seaweedfs/weed/cluster" @@ -11,7 +12,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" - "github.com/seaweedfs/seaweedfs/weed/util" ) func (fs *FilerServer) Statistics(ctx context.Context, req *filer_pb.StatisticsRequest) (resp *filer_pb.StatisticsResponse, err error) { @@ -94,10 +94,10 @@ func (fs *FilerServer) GetFilerConfiguration(ctx context.Context, req *filer_pb. Signature: fs.filer.Signature, MetricsAddress: fs.metricsAddress, MetricsIntervalSec: int32(fs.metricsIntervalSec), - Version: util.Version(), + Version: version.Version(), FilerGroup: fs.option.FilerGroup, - MajorVersion: util.MAJOR_VERSION, - MinorVersion: util.MINOR_VERSION, + MajorVersion: version.MAJOR_VERSION, + MinorVersion: version.MINOR_VERSION, } glog.V(4).Infof("GetFilerConfiguration: %v", t) diff --git a/weed/server/filer_server_handlers.go b/weed/server/filer_server_handlers.go index 1c5c89dcf..dcfc8e3ed 100644 --- a/weed/server/filer_server_handlers.go +++ b/weed/server/filer_server_handlers.go @@ -3,6 +3,7 @@ package weed_server import ( "context" "errors" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "os" "strconv" @@ -14,8 +15,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/security" - "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/stats" ) @@ -80,7 +79,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) { return } - w.Header().Set("Server", "SeaweedFS "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+version.VERSION) switch r.Method { case http.MethodGet, http.MethodHead: @@ -168,7 +167,7 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque return } - w.Header().Set("Server", "SeaweedFS "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+version.VERSION) switch r.Method { case http.MethodGet, http.MethodHead: @@ -229,7 +228,7 @@ func (fs *FilerServer) maybeCheckJwtAuthorization(r *http.Request, isWrite bool) } func (fs *FilerServer) filerHealthzHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+version.VERSION) if _, err := fs.filer.Store.FindEntry(context.Background(), filer.TopicsDir); err != nil && err != filer_pb.ErrNotFound { glog.Warningf("filerHealthzHandler FindEntry: %+v", err) w.WriteHeader(http.StatusServiceUnavailable) diff --git a/weed/server/filer_server_handlers_read_dir.go b/weed/server/filer_server_handlers_read_dir.go index 1961a2f83..14e7a50bf 100644 --- a/weed/server/filer_server_handlers_read_dir.go +++ b/weed/server/filer_server_handlers_read_dir.go @@ -2,6 +2,7 @@ package weed_server import ( "errors" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "strconv" "strings" @@ -69,7 +70,7 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque ShouldDisplayLoadMore bool EmptyFolder bool }{ - util.Version(), + version.Version(), path, entries, limit, @@ -91,7 +92,7 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque EmptyFolder bool ShowDirectoryDelete bool }{ - util.Version(), + version.Version(), path, ui.ToBreadcrumb(path), entries, diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index b16374bea..4665a7ca7 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -5,6 +5,7 @@ import ( "context" "errors" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io" "net/http" "os" @@ -51,7 +52,7 @@ func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r * if err.Error() == "operation not permitted" { writeJsonError(w, r, http.StatusForbidden, err) } else if strings.HasPrefix(err.Error(), "read input:") || err.Error() == io.ErrUnexpectedEOF.Error() { - writeJsonError(w, r, util.HttpStatusCancelled, err) + writeJsonError(w, r, version.HttpStatusCancelled, err) } else if strings.HasSuffix(err.Error(), "is a file") || strings.HasSuffix(err.Error(), "already exists") { writeJsonError(w, r, http.StatusConflict, err) } else { diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index fb0503e33..250b3168b 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -3,6 +3,7 @@ package weed_server import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "math/rand/v2" "net/http" "strconv" @@ -18,7 +19,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/super_block" "github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/seaweedfs/seaweedfs/weed/topology" - "github.com/seaweedfs/seaweedfs/weed/util" util_http "github.com/seaweedfs/seaweedfs/weed/util/http" ) @@ -49,7 +49,7 @@ func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.R func (ms *MasterServer) dirStatusHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() m["Topology"] = ms.Topo.ToInfo() writeJsonQuiet(w, r, http.StatusOK, m) } @@ -104,7 +104,7 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request func (ms *MasterServer) volumeStatusHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() m["Volumes"] = ms.Topo.ToVolumeMap() writeJsonQuiet(w, r, http.StatusOK, m) } @@ -204,7 +204,7 @@ func (ms *MasterServer) collectionInfoHandler(w http.ResponseWriter, r *http.Req for i, volumeLayout := range volumeLayouts { volumeLayoutStats := volumeLayout.Stats() m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() m["Collection"] = collectionName m["TotalSize"] = volumeLayoutStats.TotalSize m["FileCount"] = volumeLayoutStats.FileCount @@ -216,7 +216,7 @@ func (ms *MasterServer) collectionInfoHandler(w http.ResponseWriter, r *http.Req } else { //prepare the json response collectionStats := map[string]interface{}{ - "Version": util.Version(), + "Version": version.Version(), "Collection": collectionName, "TotalSize": uint64(0), "FileCount": uint64(0), diff --git a/weed/server/master_server_handlers_ui.go b/weed/server/master_server_handlers_ui.go index 2c6fa3474..65195ee1e 100644 --- a/weed/server/master_server_handlers_ui.go +++ b/weed/server/master_server_handlers_ui.go @@ -1,6 +1,7 @@ package weed_server import ( + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "time" @@ -9,7 +10,6 @@ import ( ui "github.com/seaweedfs/seaweedfs/weed/server/master_ui" "github.com/seaweedfs/seaweedfs/weed/stats" - "github.com/seaweedfs/seaweedfs/weed/util" ) func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { @@ -29,7 +29,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) Counters *stats.ServerStats VolumeSizeLimitMB uint32 }{ - util.Version(), + version.Version(), ms.Topo.ToInfo(), ms.Topo.RaftServer, infos, @@ -46,7 +46,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) Counters *stats.ServerStats VolumeSizeLimitMB uint32 }{ - util.Version(), + version.Version(), ms.Topo.ToInfo(), ms.Topo.HashicorpRaft, infos, diff --git a/weed/server/volume_grpc_admin.go b/weed/server/volume_grpc_admin.go index 2c5a538e7..dd13e3465 100644 --- a/weed/server/volume_grpc_admin.go +++ b/weed/server/volume_grpc_admin.go @@ -3,18 +3,17 @@ package weed_server import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "path/filepath" "time" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/cluster" + "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" - "github.com/seaweedfs/seaweedfs/weed/util" - - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/storage/needle" @@ -253,7 +252,7 @@ func (vs *VolumeServer) VolumeServerStatus(ctx context.Context, req *volume_serv resp := &volume_server_pb.VolumeServerStatusResponse{ MemoryStatus: stats.MemStat(), - Version: util.Version(), + Version: version.Version(), DataCenter: vs.dataCenter, Rack: vs.rack, } diff --git a/weed/server/volume_server_handlers.go b/weed/server/volume_server_handlers.go index 22ef0e1c8..3243f3ffd 100644 --- a/weed/server/volume_server_handlers.go +++ b/weed/server/volume_server_handlers.go @@ -2,14 +2,13 @@ package weed_server import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "strconv" "strings" "sync/atomic" "time" - "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/security" "github.com/seaweedfs/seaweedfs/weed/stats" @@ -37,7 +36,7 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque statusRecorder := stats.NewStatusResponseWriter(w) w = statusRecorder - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) if r.Header.Get("Origin") != "" { w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Allow-Credentials", "true") @@ -57,7 +56,7 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque select { case <-r.Context().Done(): glog.V(4).Infof("request cancelled from %s: %v", r.RemoteAddr, r.Context().Err()) - w.WriteHeader(util.HttpStatusCancelled) + w.WriteHeader(version.HttpStatusCancelled) vs.inFlightDownloadDataLimitCond.L.Unlock() return default: @@ -130,7 +129,7 @@ func getContentLength(r *http.Request) int64 { func (vs *VolumeServer) publicReadOnlyHandler(w http.ResponseWriter, r *http.Request) { statusRecorder := stats.NewStatusResponseWriter(w) w = statusRecorder - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) if r.Header.Get("Origin") != "" { w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Allow-Credentials", "true") diff --git a/weed/server/volume_server_handlers_admin.go b/weed/server/volume_server_handlers_admin.go index e344c3296..27797add3 100644 --- a/weed/server/volume_server_handlers_admin.go +++ b/weed/server/volume_server_handlers_admin.go @@ -2,16 +2,16 @@ package weed_server import ( "github.com/seaweedfs/seaweedfs/weed/topology" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "path/filepath" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" "github.com/seaweedfs/seaweedfs/weed/stats" - "github.com/seaweedfs/seaweedfs/weed/util" ) func (vs *VolumeServer) healthzHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) volumeInfos := vs.store.VolumeInfos() for _, vinfo := range volumeInfos { if len(vinfo.Collection) == 0 { @@ -29,9 +29,9 @@ func (vs *VolumeServer) healthzHandler(w http.ResponseWriter, r *http.Request) { } func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() var ds []*volume_server_pb.DiskStatus for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { @@ -46,9 +46,9 @@ func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { } func (vs *VolumeServer) statsDiskHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) m := make(map[string]interface{}) - m["Version"] = util.Version() + m["Version"] = version.Version() var ds []*volume_server_pb.DiskStatus for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go index c1c82e18c..b1ff0317f 100644 --- a/weed/server/volume_server_handlers_ui.go +++ b/weed/server/volume_server_handlers_ui.go @@ -2,6 +2,7 @@ package weed_server import ( "github.com/seaweedfs/seaweedfs/weed/pb" + "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "path/filepath" "time" @@ -10,11 +11,10 @@ import ( ui "github.com/seaweedfs/seaweedfs/weed/server/volume_server_ui" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/storage" - "github.com/seaweedfs/seaweedfs/weed/util" ) func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION) + w.Header().Set("Server", "SeaweedFS Volume "+version.VERSION) infos := make(map[string]interface{}) infos["Up Time"] = time.Now().Sub(startTime).String() var ds []*volume_server_pb.DiskStatus @@ -44,7 +44,7 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) Stats interface{} Counters *stats.ServerStats }{ - util.Version(), + version.Version(), vs.SeedMasterNodes, normalVolumeInfos, vs.store.EcVolumes(), diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 47fa055e7..5ab264950 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -3,6 +3,7 @@ package weed_server import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "io" "os" "path" @@ -129,7 +130,7 @@ type WebDavFile struct { func NewWebDavFileSystem(option *WebDavOption) (webdav.FileSystem, error) { - cacheUniqueId := util.Md5String([]byte("webdav" + string(option.Filer) + util.Version()))[0:8] + cacheUniqueId := util.Md5String([]byte("webdav" + string(option.Filer) + version.Version()))[0:8] cacheDir := path.Join(option.CacheDir, cacheUniqueId) os.MkdirAll(cacheDir, os.FileMode(0755)) diff --git a/weed/storage/backend/s3_backend/s3_sessions.go b/weed/storage/backend/s3_backend/s3_sessions.go index 835b9b4d2..ca3fc62fc 100644 --- a/weed/storage/backend/s3_backend/s3_sessions.go +++ b/weed/storage/backend/s3_backend/s3_sessions.go @@ -2,13 +2,12 @@ package s3_backend import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "sync" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" @@ -51,7 +50,7 @@ func createSession(awsAccessKeyId, awsSecretAccessKey, region, endpoint string, return nil, fmt.Errorf("create aws session in region %s: %v", region, err) } sess.Handlers.Build.PushBack(func(r *request.Request) { - r.HTTPRequest.Header.Set("User-Agent", "SeaweedFS/"+util.VERSION_NUMBER) + r.HTTPRequest.Header.Set("User-Agent", "SeaweedFS/"+version.VERSION_NUMBER) }) t := s3.New(sess) diff --git a/weed/util/constants_4bytes.go b/weed/util/constants_4bytes.go index 187e33909..4cf07165e 100644 --- a/weed/util/constants_4bytes.go +++ b/weed/util/constants_4bytes.go @@ -4,6 +4,6 @@ package util const ( - sizeLimit = "30GB" + SizeLimit = "30GB" VolumeSizeLimitGB = 30 ) diff --git a/weed/util/constants_5bytes.go b/weed/util/constants_5bytes.go index 7c6a158cf..406287440 100644 --- a/weed/util/constants_5bytes.go +++ b/weed/util/constants_5bytes.go @@ -4,6 +4,6 @@ package util const ( - sizeLimit = "8000GB" + SizeLimit = "8000GB" VolumeSizeLimitGB = 8000 ) diff --git a/weed/util/constants.go b/weed/util/version/constants.go index a5701c1a4..5cf2dd738 100644 --- a/weed/util/constants.go +++ b/weed/util/version/constants.go @@ -1,7 +1,8 @@ -package util +package version import ( "fmt" + "github.com/seaweedfs/seaweedfs/weed/util" ) const HttpStatusCancelled = 499 @@ -10,7 +11,7 @@ var ( MAJOR_VERSION = int32(3) MINOR_VERSION = int32(89) VERSION_NUMBER = fmt.Sprintf("%d.%02d", MAJOR_VERSION, MINOR_VERSION) - VERSION = sizeLimit + " " + VERSION_NUMBER + VERSION = util.SizeLimit + " " + VERSION_NUMBER COMMIT = "" ) diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go index eccf1d14b..ed3b9f93b 100644 --- a/weed/wdclient/masterclient.go +++ b/weed/wdclient/masterclient.go @@ -3,6 +3,7 @@ package wdclient import ( "context" "fmt" + "github.com/seaweedfs/seaweedfs/weed/util/version" "math/rand" "sync" "time" @@ -208,7 +209,7 @@ func (mc *MasterClient) tryConnectToMaster(ctx context.Context, master pb.Server Rack: mc.rack, ClientType: mc.clientType, ClientAddress: string(mc.clientHost), - Version: util.Version(), + Version: version.Version(), }); err != nil { glog.V(0).Infof("%s.%s masterClient failed to send to %s: %v", mc.FilerGroup, mc.clientType, master, err) stats.MasterClientConnectCounter.WithLabelValues(stats.FailedToSend).Inc() |