gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chrislusf/seaweedfs

Browse source
This commit is contained in:
chrislu 2022-01-21 00:17:06 -08:00
parent ea57654e34 7c66f3b5fb
commit 6c7135d77e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/binaries_dev.yml vendored
View file

@ -20,12 +20,12 @@ jobs:
assets: | assets: |
weed-* weed-*
build_dev_linux: build_dev_linux_windows:
needs: cleanup needs: cleanup
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
goos: [linux] goos: [linux, windows]
goarch: [amd64] goarch: [amd64]
steps: steps:
@ -68,7 +68,7 @@ jobs:
asset_name: "weed-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}" asset_name: "weed-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}"
build_dev_darwin: build_dev_darwin:
needs: build_dev_linux needs: build_dev_linux_windows
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:

4
weed/command/master.go
View file

@ -2,6 +2,7 @@ package command
import ( import (
"github.com/chrislusf/raft/protobuf" "github.com/chrislusf/raft/protobuf"
stats_collect "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
"net/http" "net/http"
@ -42,6 +43,7 @@ type MasterOptions struct {
metricsAddress *string metricsAddress *string
metricsIntervalSec *int metricsIntervalSec *int
raftResumeState *bool raftResumeState *bool
metricsHttpPort *int
} }
func init() { func init() {
@ -61,6 +63,7 @@ func init() {
m.disableHttp = cmdMaster.Flag.Bool("disableHttp", false, "disable http requests, only gRPC operations are allowed.") 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.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.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") 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") glog.Fatalf("volumeSizeLimitMB should be smaller than 30000")
} }
go stats_collect.StartMetricsServer(*m.metricsHttpPort)
startMaster(m, masterWhiteList) startMaster(m, masterWhiteList)
return true return true