@@ -100,23 +100,23 @@ func (s *spaceChecker) Fix(ctx context.Context, spaceId string) (Result, error)
100100 return res , nil
101101 }
102102
103- C := res .CoordinatorStatus
104- L := res .LocalStatus
105- E := res .SpaceStorageExists
106- R := res .IsResponsible
103+ coordStatus := res .CoordinatorStatus
104+ localStatus := res .LocalStatus
105+ storageExists := res .SpaceStorageExists
106+ isResponsible := res .IsResponsible
107107 indexStorage := s .storageService .IndexStorage ()
108108
109109 switch {
110110 // C:Removed, L: not removed or E:true - remove space and switch local status
111- case C == "removed" && (L != "removed" || E ):
112- if E {
111+ case coordStatus == "removed" && (localStatus != "removed" || storageExists ):
112+ if storageExists {
113113 err = s .storageService .DeleteSpaceStorage (ctx , spaceId )
114114 if err != nil && ! errors .Is (err , spacestorage .ErrSpaceStorageMissing ) {
115115 return res , fmt .Errorf ("delete space storage: %w" , err )
116116 }
117117 res .Log = append (res .Log , "fix: deleted space storage" )
118118 }
119- if L != "removed" {
119+ if localStatus != "removed" {
120120 err = indexStorage .SetSpaceStatus (ctx , spaceId , nodestorage .SpaceStatusRemove , "" )
121121 if err != nil {
122122 return res , fmt .Errorf ("set status removed: %w" , err )
@@ -126,7 +126,7 @@ func (s *spaceChecker) Fix(ctx context.Context, spaceId string) (Result, error)
126126 res .IsFixed = true
127127
128128 // C:prepRemove, L: not prep remove - switch local status
129- case C == "remPrepare" && L != "remPrepare" :
129+ case coordStatus == "remPrepare" && localStatus != "remPrepare" :
130130 err = indexStorage .SetSpaceStatus (ctx , spaceId , nodestorage .SpaceStatusRemovePrepare , "" )
131131 if err != nil {
132132 return res , fmt .Errorf ("set status remPrepare: %w" , err )
@@ -135,13 +135,13 @@ func (s *spaceChecker) Fix(ctx context.Context, spaceId string) (Result, error)
135135 res .IsFixed = true
136136
137137 // C:Ok, L:Ok, R:false - set notResponsible, move storage if exists
138- case C == "ok" && L == "ok" && ! R :
138+ case coordStatus == "ok" && localStatus == "ok" && ! isResponsible :
139139 err = indexStorage .SetSpaceStatus (ctx , spaceId , nodestorage .SpaceStatusNotResponsible , "" )
140140 if err != nil {
141141 return res , fmt .Errorf ("set status notResponsible: %w" , err )
142142 }
143143 res .Log = append (res .Log , "fix: set local status to notResponsible" )
144- if E {
144+ if storageExists {
145145 srcDir := s .storageService .StoreDir (spaceId )
146146 dstDir := s .storageService .StoreDir (filepath .Join ("notresponsible" , spaceId ))
147147 if err = os .MkdirAll (filepath .Dir (dstDir ), 0755 ); err != nil {
@@ -190,39 +190,39 @@ func (s *spaceChecker) getCoordinatorStatus(ctx context.Context, spaceId string,
190190}
191191
192192func (s * spaceChecker ) validate (res * Result , localStr string , coordStr string ) {
193- C := coordStr
194- L := localStr
195- R := res .IsResponsible
196- E := res .SpaceStorageExists
193+ coordStatus := coordStr
194+ localStatus := localStr
195+ isResponsible := res .IsResponsible
196+ storageExists := res .SpaceStorageExists
197197
198198 valid := false
199199 switch {
200200 // C: ok, L: ok, R: true, E: true
201- case C == "ok" && L == "ok" && R && E :
201+ case coordStatus == "ok" && localStatus == "ok" && isResponsible && storageExists :
202202 valid = true
203203 // C: ok, L: archived, R: true, E: false
204- case C == "ok" && L == "archived" && R && ! E :
204+ case coordStatus == "ok" && localStatus == "archived" && isResponsible && ! storageExists :
205205 valid = true
206206 // C: remPrepare, L: remPrepare, R: true, E: true
207- case C == "remPrepare" && L == "remPrepare" && R && E :
207+ case coordStatus == "remPrepare" && localStatus == "remPrepare" && isResponsible && storageExists :
208208 valid = true
209209 // C: remPrepare, L: remPrepare, R: false, E: false
210- case C == "remPrepare" && L == "remPrepare" && ! R && ! E :
210+ case coordStatus == "remPrepare" && localStatus == "remPrepare" && ! isResponsible && ! storageExists :
211211 valid = true
212212 // C: removed, L: removed, E: false
213- case C == "removed" && L == "removed" && ! E :
213+ case coordStatus == "removed" && localStatus == "removed" && ! storageExists :
214214 valid = true
215215 }
216216
217217 if ! valid {
218218 var problems []string
219- if C == "error" {
219+ if coordStatus == "error" {
220220 problems = append (problems , "coordinator_error" )
221221 }
222- if L == "unknown" {
222+ if localStatus == "unknown" {
223223 problems = append (problems , "local_status_unknown" )
224224 }
225- problems = append (problems , fmt .Sprintf ("invalid_state(C:%s,L:%s,R:%v,E:%v)" , C , L , R , E ))
225+ problems = append (problems , fmt .Sprintf ("invalid_state(C:%s,L:%s,R:%v,E:%v)" , coordStatus , localStatus , isResponsible , storageExists ))
226226 res .Problems = problems
227227 }
228228}
0 commit comments