feat: add log for enhancing quota managing

eshao731 · Mar 6, 2020 · e84bfaa · e84bfaa
1 parent 5cb0d1b
commit e84bfaa
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 6 deletions.
diff --git a/pkg/business/controller/namespace/deletion/namespaced_resources_deleter.go b/pkg/business/controller/namespace/deletion/namespaced_resources_deleter.go
@@ -282,7 +282,7 @@ func recalculateProjectUsed(deleter *namespacedResourcesDeleter, namespace *v1.N
  if project.Status.Clusters != nil {
  clusterUsed, clusterUsedExist := project.Status.Clusters[namespace.Spec.ClusterName]
  if clusterUsedExist {
- release := namespace.Spec.Hard
+ release := namespace.Spec.Hard // For historic data that has no CachedSpecHard
  if namespace.Status.CachedSpecHard != nil {
  release = namespace.Status.CachedSpecHard
  }

diff --git a/pkg/business/controller/namespace/namespace_cache.go b/pkg/business/controller/namespace/namespace_cache.go
@@ -44,7 +44,7 @@ func (s *namespaceCache) getOrCreate(name string, self *v1.Namespace) *cachedNam
  namespace.state = self.DeepCopy()
  if self.Status.CachedSpecHard != nil {
  namespace.state.Spec.Hard = self.Status.CachedSpecHard
- } else {
+ } else { // For historic data that has no CachedSpecHard
  namespace.state.Spec.Hard = self.Spec.Hard
  }
  }

diff --git a/pkg/business/controller/namespace/namespace_controller.go b/pkg/business/controller/namespace/namespace_controller.go
@@ -284,6 +284,7 @@ func (c *Controller) handlePhase(key string, cachedNamespace *cachedNamespace, n
  // Since it's pending now, no need to set v1.NamespaceFailed.
  return err
  }
+ // Once project has been updated, try our best update namespace CachedSpecHard.
  namespace.Status.CachedSpecHard = namespace.Spec.Hard
  if err := c.ensureNamespaceOnCluster(namespace); err != nil {
  namespace.Status.Phase = v1.NamespaceFailed
@@ -305,6 +306,7 @@ func (c *Controller) handlePhase(key string, cachedNamespace *cachedNamespace, n
  namespace.Status.LastTransitionTime = metav1.Now()
  return c.persistUpdate(namespace)
  }
+ // Once project has been updated, try our best update namespace CachedSpecHard.
  cachedHard := namespace.Status.CachedSpecHard
  namespace.Status.CachedSpecHard = namespace.Spec.Hard
  if err := c.ensureNamespaceOnCluster(namespace); err != nil {
@@ -331,6 +333,8 @@ func (c *Controller) calculateProjectUsed(cachedNamespace *cachedNamespace, name
  return err
  }
  calculatedNamespaceNames := sets.NewString(project.Status.CalculatedNamespaces...)
+ // The following "if" clause is supposed to process "Pending" namespaces.
+ // The "else if" is for "Available" namespaces.
  if !calculatedNamespaceNames.Has(namespace.ObjectMeta.Name) {
  project.Status.CalculatedNamespaces = append(project.Status.CalculatedNamespaces, namespace.ObjectMeta.Name)
  if project.Status.Clusters == nil {

diff --git a/pkg/business/controller/project/deletion/projected_resources_deleter.go b/pkg/business/controller/project/deletion/projected_resources_deleter.go
@@ -287,7 +287,7 @@ func recalculateParentProjectUsed(deleter *projectedResourcesDeleter, project *b
  calculatedChildProjectNames.Delete(project.ObjectMeta.Name)
  parentProject.Status.CalculatedChildProjects = calculatedChildProjectNames.List()
  if parentProject.Status.Clusters != nil {
- release := project.Spec.Clusters
+ release := project.Spec.Clusters // For historic data that has no CachedSpecClusters
  if project.Status.CachedSpecClusters != nil {
  release = project.Status.CachedSpecClusters
  }

diff --git a/pkg/business/controller/project/project_cache.go b/pkg/business/controller/project/project_cache.go
@@ -44,7 +44,7 @@ func (s *projectCache) getOrCreate(name string, self *v1.Project) *cachedProject
  project.state = self.DeepCopy()
  if self.Status.CachedSpecClusters != nil {
  project.state.Spec.Clusters = self.Status.CachedSpecClusters
- } else {
+ } else { // For historic data that has no CachedSpecClusters
  project.state.Spec.Clusters = self.Spec.Clusters
  }
  }

diff --git a/pkg/business/controller/project/project_controller.go b/pkg/business/controller/project/project_controller.go
@@ -292,6 +292,7 @@ func (c *Controller) handlePhase(key string, cachedProject *cachedProject, proje
  return err
  }
  }
+ // Once parentProject has been updated, update project CachedSpecClusters immediately.
  if project != nil && !reflect.DeepEqual(project.Spec.Clusters, project.Status.CachedSpecClusters) {
  return c.updateCache(project, project.Spec.Clusters)
  }

diff --git a/pkg/business/registry/namespace/strategy.go b/pkg/business/registry/namespace/strategy.go
@@ -73,7 +73,7 @@ func (Strategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {
  }
  if oldNamespace.Status.CachedSpecHard != nil {
  namespace.Status.CachedSpecHard = oldNamespace.Status.CachedSpecHard
- } else {
+ } else { // For historic data that has no CachedSpecHard
  namespace.Status.CachedSpecHard = oldNamespace.Spec.Hard
  }
 }

diff --git a/pkg/business/registry/project/strategy.go b/pkg/business/registry/project/strategy.go
@@ -95,7 +95,7 @@ func (Strategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {
  }
  if oldProject.Status.CachedSpecClusters != nil {
  project.Status.CachedSpecClusters = oldProject.Status.CachedSpecClusters
- } else {
+ } else { // For historic data that has no CachedSpecClusters
  project.Status.CachedSpecClusters = oldProject.Spec.Clusters
  }
 }