Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update status while scaling #249

Merged
merged 1 commit into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions charts/nebula-operator/templates/controller-manager-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@ metadata:
labels:
{{- include "controller-manager.labels" . | nindent 4 }}
rules:
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/component/storaged_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ func (c *storagedCluster) syncStoragedWorkload(nc *v1alpha1.NebulaCluster) error

if *newReplicas > *oldReplicas {
if err := c.addStorageHosts(nc, *oldReplicas, *newReplicas); err != nil {
klog.Errorf("add storage hosts failed: %v", err)
return err
}
klog.Infof("storaged cluster [%s/%s] add hosts succeed", namespace, componentName)
Expand Down
17 changes: 13 additions & 4 deletions pkg/controller/component/storaged_scaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ func (ss *storageScaler) ScaleOut(nc *v1alpha1.NebulaCluster) error {
continue
}
if err := ss.balanceSpace(metaClient, nc, *space.Id.SpaceID); err != nil {
klog.Errorf("balance space %d failed: %v", *space.Id.SpaceID, err)
return err
}
}
Expand Down Expand Up @@ -150,7 +151,7 @@ func (ss *storageScaler) ScaleIn(nc *v1alpha1.NebulaCluster, oldReplicas, newRep
}

if oldReplicas-newReplicas > 0 {
scaleSets := sets.NewString()
scaleSets := sets.New[string]()
hosts := make([]*nebulago.HostAddr, 0, oldReplicas-newReplicas)
port := nc.StoragedComponent().GetPort(v1alpha1.StoragedPortNameThrift)
for i := oldReplicas - 1; i >= newReplicas; i-- {
Expand All @@ -167,17 +168,19 @@ func (ss *storageScaler) ScaleIn(nc *v1alpha1.NebulaCluster, oldReplicas, newRep
if err != nil {
return err
}
removed := filterRemovedHosts(sets.NewString(leaderSets...), scaleSets, hosts)
removed := filterRemovedHosts(sets.New[string](leaderSets...), scaleSets, hosts)
if len(removed) == 0 {
continue
}
if err := ss.removeHost(metaClient, nc, *space.Id.SpaceID, hosts); err != nil {
klog.Errorf("remove hosts %v failed: %v", hosts, err)
return err
}
klog.Infof("cluster [%s/%s] remove hosts from space %s successfully", ns, ncName, space.Name)
}
}
if err := metaClient.DropHosts(hosts); err != nil {
klog.Errorf("drop hosts %v failed: %v", hosts, err)
return err
}
klog.Infof("cluster [%s/%s] drop hosts successfully", ns, ncName)
Expand Down Expand Up @@ -245,6 +248,9 @@ func (ss *storageScaler) balanceSpace(mc nebula.MetaInterface, nc *v1alpha1.Nebu
SpaceID: spaceID,
JobID: jobID,
}
if err := ss.clientSet.NebulaCluster().UpdateNebulaClusterStatus(nc.DeepCopy()); err != nil {
return err
}
}
return err
}
Expand All @@ -267,14 +273,17 @@ func (ss *storageScaler) removeHost(
SpaceID: spaceID,
JobID: jobID,
}
if err := ss.clientSet.NebulaCluster().UpdateNebulaClusterStatus(nc.DeepCopy()); err != nil {
return err
}
}
return err
}
return nil
}

func filterRemovedHosts(leaderSets, scaleSets sets.String, scaledHosts []*nebulago.HostAddr) []*nebulago.HostAddr {
result := sets.NewString()
func filterRemovedHosts(leaderSets, scaleSets sets.Set[string], scaledHosts []*nebulago.HostAddr) []*nebulago.HostAddr {
result := sets.New[string]()
for key := range scaleSets {
if leaderSets.Has(key) {
result.Insert(key)
Expand Down