diff options
| -rw-r--r-- | weed/command/master.go | 2 | ||||
| -rw-r--r-- | weed/server/master_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server_handlers_ui.go | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 0f5e2156d..bed55e334 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -198,7 +198,7 @@ func (m *MasterOptions) toMasterOption(whiteList []string) *weed_server.MasterOp Host: *m.ip, Port: *m.port, MetaFolder: *m.metaFolder, - VolumeSizeLimitMB: *m.volumeSizeLimitMB, + VolumeSizeLimitMB: uint32(*m.volumeSizeLimitMB), VolumePreallocate: *m.volumePreallocate, // PulseSeconds: *m.pulseSeconds, DefaultReplicaPlacement: *m.defaultReplication, diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 50c9dbfdf..166432c28 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -313,6 +313,8 @@ func (ms *MasterServer) GetMasterConfiguration(ctx context.Context, req *master_ MetricsIntervalSeconds: uint32(ms.option.MetricsIntervalSec), StorageBackends: backend.ToPbStorageBackends(), DefaultReplication: ms.option.DefaultReplicaPlacement, + VolumeSizeLimitMB: uint32(ms.option.VolumeSizeLimitMB), + VolumePreallocate: ms.option.VolumePreallocate, Leader: leader, } diff --git a/weed/server/master_server.go b/weed/server/master_server.go index eab41524c..273d6ba7d 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -35,7 +35,7 @@ type MasterOption struct { Host string Port int MetaFolder string - VolumeSizeLimitMB uint + VolumeSizeLimitMB uint32 VolumePreallocate bool // PulseSeconds int DefaultReplicaPlacement string diff --git a/weed/server/master_server_handlers_ui.go b/weed/server/master_server_handlers_ui.go index 3822c6113..015bfbd00 100644 --- a/weed/server/master_server_handlers_ui.go +++ b/weed/server/master_server_handlers_ui.go @@ -19,7 +19,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) RaftServer raft.Server Stats map[string]interface{} Counters *stats.ServerStats - VolumeSizeLimitMB uint + VolumeSizeLimitMB uint32 }{ util.Version(), ms.Topo.ToMap(), |