diff options
| author | chrislu <chris.lu@gmail.com> | 2022-01-21 00:17:06 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-01-21 00:17:06 -0800 |
| commit | 6c7135d77ead544dab1c99373ba6cc96af63f323 (patch) | |
| tree | d381b7580c804758c92bcf8cf954dcef2650e1ac | |
| parent | ea57654e34353b46f0b2725c9734891f1574c4d4 (diff) | |
| parent | 7c66f3b5fb235eb66e155b2aa4dabde4ac9134b0 (diff) | |
| download | seaweedfs-6c7135d77ead544dab1c99373ba6cc96af63f323.tar.xz seaweedfs-6c7135d77ead544dab1c99373ba6cc96af63f323.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
| -rw-r--r-- | .github/workflows/binaries_dev.yml | 6 | ||||
| -rw-r--r-- | weed/command/master.go | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/binaries_dev.yml b/.github/workflows/binaries_dev.yml index 5b34b5f4b..207bb9700 100644 --- a/.github/workflows/binaries_dev.yml +++ b/.github/workflows/binaries_dev.yml @@ -20,12 +20,12 @@ jobs: assets: | weed-* - build_dev_linux: + build_dev_linux_windows: needs: cleanup runs-on: ubuntu-latest strategy: matrix: - goos: [linux] + goos: [linux, windows] goarch: [amd64] steps: @@ -68,7 +68,7 @@ jobs: asset_name: "weed-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}" build_dev_darwin: - needs: build_dev_linux + needs: build_dev_linux_windows runs-on: ubuntu-latest strategy: matrix: diff --git a/weed/command/master.go b/weed/command/master.go index fc3e41d8d..0f598f2da 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -2,6 +2,7 @@ package command import ( "github.com/chrislusf/raft/protobuf" + stats_collect "github.com/chrislusf/seaweedfs/weed/stats" "github.com/gorilla/mux" "google.golang.org/grpc/reflection" "net/http" @@ -42,6 +43,7 @@ type MasterOptions struct { metricsAddress *string metricsIntervalSec *int raftResumeState *bool + metricsHttpPort *int } func init() { @@ -61,6 +63,7 @@ func init() { m.disableHttp = cmdMaster.Flag.Bool("disableHttp", false, "disable http requests, only gRPC operations are allowed.") m.metricsAddress = cmdMaster.Flag.String("metrics.address", "", "Prometheus gateway address <host>:<port>") m.metricsIntervalSec = cmdMaster.Flag.Int("metrics.intervalSeconds", 15, "Prometheus push interval in seconds") + m.metricsHttpPort = cmdMaster.Flag.Int("metricsPort", 0, "Prometheus metrics listen port") m.raftResumeState = cmdMaster.Flag.Bool("resumeState", false, "resume previous state on start master server") } @@ -104,6 +107,7 @@ func runMaster(cmd *Command, args []string) bool { glog.Fatalf("volumeSizeLimitMB should be smaller than 30000") } + go stats_collect.StartMetricsServer(*m.metricsHttpPort) startMaster(m, masterWhiteList) return true |