@@ -48,8 +48,15 @@ type step2SetClusterPool struct {
48
48
storage * storage.Storage
49
49
}
50
50
51
+ func getPoolset (curveadm * cli.CurveAdm , kind string ) configure.Poolset {
52
+ if kind == configure .KIND_CURVEFS {
53
+ return configure.Poolset {}
54
+ }
55
+ return curveadm .MemStorage ().Get (comm .KEY_POOLSET ).(configure.Poolset )
56
+ }
57
+
51
58
func getClusterPool (curveadm * cli.CurveAdm , dc * topology.DeployConfig ) (configure.CurveClusterTopo , error ) {
52
- poolset := curveadm . MemStorage (). Get ( comm . KEY_POOLSET ).(configure. Poolset )
59
+ poolset := getPoolset ( curveadm , dc . GetKind () )
53
60
oldPool := configure.CurveClusterTopo {}
54
61
dcs , err := curveadm .ParseTopology ()
55
62
if err != nil {
@@ -99,7 +106,7 @@ func prepare(curveadm *cli.CurveAdm, dc *topology.DeployConfig) (clusterPoolJson
99
106
// 2. scale out cluster or migrate servers
100
107
if curveadm .MemStorage ().Get (comm .KEY_SCALE_OUT_CLUSTER ) != nil { // scale out cluster
101
108
dcs := curveadm .MemStorage ().Get (comm .KEY_SCALE_OUT_CLUSTER ).([]* topology.DeployConfig )
102
- poolset := curveadm . MemStorage (). Get ( comm . KEY_POOLSET ).(configure. Poolset )
109
+ poolset := getPoolset ( curveadm , dc . GetKind () )
103
110
configure .ScaleOutClusterPool (& clusterPool , dcs , poolset )
104
111
} else if curveadm .MemStorage ().Get (comm .KEY_MIGRATE_SERVERS ) != nil { // migrate servers
105
112
migrates := curveadm .MemStorage ().Get (comm .KEY_MIGRATE_SERVERS ).([]* configure.MigrateServer )
0 commit comments