Browse Source

adjust data type

pull/2274/head
Chris Lu 4 years ago
parent
commit
5469019852
  1. 2
      weed/command/master.go
  2. 2
      weed/server/master_grpc_server.go
  3. 2
      weed/server/master_server.go
  4. 2
      weed/server/master_server_handlers_ui.go

2
weed/command/master.go

@ -198,7 +198,7 @@ func (m *MasterOptions) toMasterOption(whiteList []string) *weed_server.MasterOp
Host: *m.ip, Host: *m.ip,
Port: *m.port, Port: *m.port,
MetaFolder: *m.metaFolder, MetaFolder: *m.metaFolder,
VolumeSizeLimitMB: *m.volumeSizeLimitMB,
VolumeSizeLimitMB: uint32(*m.volumeSizeLimitMB),
VolumePreallocate: *m.volumePreallocate, VolumePreallocate: *m.volumePreallocate,
// PulseSeconds: *m.pulseSeconds, // PulseSeconds: *m.pulseSeconds,
DefaultReplicaPlacement: *m.defaultReplication, DefaultReplicaPlacement: *m.defaultReplication,

2
weed/server/master_grpc_server.go

@ -313,6 +313,8 @@ func (ms *MasterServer) GetMasterConfiguration(ctx context.Context, req *master_
MetricsIntervalSeconds: uint32(ms.option.MetricsIntervalSec), MetricsIntervalSeconds: uint32(ms.option.MetricsIntervalSec),
StorageBackends: backend.ToPbStorageBackends(), StorageBackends: backend.ToPbStorageBackends(),
DefaultReplication: ms.option.DefaultReplicaPlacement, DefaultReplication: ms.option.DefaultReplicaPlacement,
VolumeSizeLimitMB: uint32(ms.option.VolumeSizeLimitMB),
VolumePreallocate: ms.option.VolumePreallocate,
Leader: leader, Leader: leader,
} }

2
weed/server/master_server.go

@ -35,7 +35,7 @@ type MasterOption struct {
Host string Host string
Port int Port int
MetaFolder string MetaFolder string
VolumeSizeLimitMB uint
VolumeSizeLimitMB uint32
VolumePreallocate bool VolumePreallocate bool
// PulseSeconds int // PulseSeconds int
DefaultReplicaPlacement string DefaultReplicaPlacement string

2
weed/server/master_server_handlers_ui.go

@ -19,7 +19,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request)
RaftServer raft.Server RaftServer raft.Server
Stats map[string]interface{} Stats map[string]interface{}
Counters *stats.ServerStats Counters *stats.ServerStats
VolumeSizeLimitMB uint
VolumeSizeLimitMB uint32
}{ }{
util.Version(), util.Version(),
ms.Topo.ToMap(), ms.Topo.ToMap(),

Loading…
Cancel
Save