admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add code comments and clean code.

Browse Source 
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
This commit is contained in:
Rao Yunkun
2021-04-01 18:37:33 +08:00
parent 836b279fee
commit bb024d8ad4
2 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/models/metering/type.go
View File

@@ -161,12 +161,11 @@ type ServiceStatistic struct {
Pods map[string]*PodStatistic `json:"pods" description:"pod statistic"` Pods map[string]*PodStatistic `json:"pods" description:"pod statistic"`
} }
func (ss *ServiceStatistic) SetPodStats(name string, podStat *PodStatistic) error { func (ss *ServiceStatistic) SetPodStats(name string, podStat *PodStatistic) {
if ss.Pods == nil { if ss.Pods == nil {
ss.Pods = make(map[string]*PodStatistic) ss.Pods = make(map[string]*PodStatistic)
} }
ss.Pods[name] = podStat ss.Pods[name] = podStat
return nil
} }
func (ss *ServiceStatistic) GetPodStats(name string) *PodStatistic { func (ss *ServiceStatistic) GetPodStats(name string) *PodStatistic {
@@ -211,12 +210,11 @@ func (ds *DeploymentStatistic) GetPodStats(name string) *PodStatistic {
return ds.Pods[name] return ds.Pods[name]
} }
func (ds *DeploymentStatistic) SetPodStats(name string, podStat *PodStatistic) error { func (ds *DeploymentStatistic) SetPodStats(name string, podStat *PodStatistic) {
if ds.Pods == nil { if ds.Pods == nil {
ds.Pods = make(map[string]*PodStatistic) ds.Pods = make(map[string]*PodStatistic)
} }
ds.Pods[name] = podStat ds.Pods[name] = podStat
return nil
} }
func (ds *DeploymentStatistic) Aggregate() { func (ds *DeploymentStatistic) Aggregate() {
@@ -252,12 +250,11 @@ func (ss *StatefulsetStatistic) GetPodStats(name string) *PodStatistic {
return ss.Pods[name] return ss.Pods[name]
} }
func (ss *StatefulsetStatistic) SetPodStats(name string, podStat *PodStatistic) error { func (ss *StatefulsetStatistic) SetPodStats(name string, podStat *PodStatistic) {
if ss.Pods == nil { if ss.Pods == nil {
ss.Pods = make(map[string]*PodStatistic) ss.Pods = make(map[string]*PodStatistic)
} }
ss.Pods[name] = podStat ss.Pods[name] = podStat
return nil
} }
func (ss *StatefulsetStatistic) Aggregate() { func (ss *StatefulsetStatistic) Aggregate() {
@@ -293,12 +290,11 @@ func (ds *DaemonsetStatistic) GetPodStats(name string) *PodStatistic {
return ds.Pods[name] return ds.Pods[name]
} }
func (ds *DaemonsetStatistic) SetPodStats(name string, podStat *PodStatistic) error { func (ds *DaemonsetStatistic) SetPodStats(name string, podStat *PodStatistic) {
if ds.Pods == nil { if ds.Pods == nil {
ds.Pods = make(map[string]*PodStatistic) ds.Pods = make(map[string]*PodStatistic)
} }
ds.Pods[name] = podStat ds.Pods[name] = podStat
return nil
} }
func (ds *DaemonsetStatistic) Aggregate() { func (ds *DaemonsetStatistic) Aggregate() {

73
pkg/models/tenant/metering.go
View File

@@ -781,10 +781,10 @@ func (t *tenantOperator) updateDeploysStats(user user.Info, cluster, ns string,
// for op deployment // for op deployment
for _, pod := range pods { for _, pod := range pods {
podsStat := podsStats[pod] podsStat := podsStats[pod]
if err := resourceStats.GetOpenPitrixStats(opName).GetDeployStats(deploy.Name).SetPodStats(pod, podsStat); err != nil { // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
klog.Error(err) // and then set pod stats data, the direction is as follows:
return err // OpenPitrix field(create if not existed) -> deployments field(create if not existed) -> pod
} resourceStats.GetOpenPitrixStats(opName).GetDeployStats(deploy.Name).SetPodStats(pod, podsStat)
} }
} else if ok, appName := t.isAppComponent(ns, "deployment", deploy.Name); ok { } else if ok, appName := t.isAppComponent(ns, "deployment", deploy.Name); ok {
// for app deployment // for app deployment
@@ -794,20 +794,19 @@ func (t *tenantOperator) updateDeploysStats(user user.Info, cluster, ns string,
klog.Warningf("%v not found", pod) klog.Warningf("%v not found", pod)
continue continue
} }
// aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
if err := resourceStats.GetAppStats(appName).GetDeployStats(deploy.Name).SetPodStats(pod, podsStat); err != nil { // and then set pod stats data, the direction is as follows:
klog.Error(err) // App field(create if not existed) -> deployments field(create if not existed) -> pod
return err resourceStats.GetAppStats(appName).GetDeployStats(deploy.Name).SetPodStats(pod, podsStat)
}
} }
} else { } else {
// for k8s deployment only // for k8s deployment only
for _, pod := range pods { for _, pod := range pods {
if err := resourceStats.GetDeployStats(deploy.Name).SetPodStats(pod, podsStats[pod]); err != nil { // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
klog.Error(err) // and then set pod stats data, the direction is as follows:
return err // Deployments field(create if not existed) -> pod
} resourceStats.GetDeployStats(deploy.Name).SetPodStats(pod, podsStats[pod])
} }
} }
} }
@@ -850,29 +849,26 @@ func (t *tenantOperator) updateDaemonsetsStats(user user.Info, cluster, ns strin
if ok, opName := t.isOpenPitrixComponent(cluster, ns, "daemonset", daemonset.Name); ok { if ok, opName := t.isOpenPitrixComponent(cluster, ns, "daemonset", daemonset.Name); ok {
// for op daemonset // for op daemonset
for _, pod := range pods { for _, pod := range pods {
if err := resourceStats.GetOpenPitrixStats(opName).GetDaemonStats(daemonset.Name).SetPodStats(pod, podsStats[pod]); err != nil { // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
klog.Error(err) // and then set pod stats data, the direction is as follows:
return err // OpenPitrix field(create if not existed) -> daemonsets field(create if not existed) -> pod
} resourceStats.GetOpenPitrixStats(opName).GetDaemonStats(daemonset.Name).SetPodStats(pod, podsStats[pod])
} }
} else if ok, appName := t.isAppComponent(ns, "daemonset", daemonset.Name); ok { } else if ok, appName := t.isAppComponent(ns, "daemonset", daemonset.Name); ok {
// for app daemonset // for app daemonset
for _, pod := range pods { for _, pod := range pods {
// aggregate order is from bottom(pods) to top(app), we should create outer field if not exists // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
// and then set pod stats data, the direction is as follows: // and then set pod stats data, the direction is as follows:
// app field(create if not existed) -> statefulsets field(create if not existed) -> pod // App field(create if not existed) -> daemonsets field(create if not existed) -> pod
if err := resourceStats.GetAppStats(appName).GetDaemonStats(daemonset.Name).SetPodStats(pod, podsStats[pod]); err != nil { resourceStats.GetAppStats(appName).GetDaemonStats(daemonset.Name).SetPodStats(pod, podsStats[pod])
klog.Error(err)
return err
}
} }
} else { } else {
// for k8s daemonset // for k8s daemonset
for _, pod := range pods { for _, pod := range pods {
if err := resourceStats.GetDaemonsetStats(daemonset.Name).SetPodStats(pod, podsStats[pod]); err != nil { // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
klog.Error(err) // and then set pod stats data, the direction is as follows:
return err // Daemonsets field(create if not existed) -> pod
} resourceStats.GetDaemonsetStats(daemonset.Name).SetPodStats(pod, podsStats[pod])
} }
} }
} }
@@ -1001,31 +997,26 @@ func (t *tenantOperator) updateStatefulsetsStats(user user.Info, cluster, ns str
if ok, opName := t.isOpenPitrixComponent(cluster, ns, "statefulset", statefulset.Name); ok { if ok, opName := t.isOpenPitrixComponent(cluster, ns, "statefulset", statefulset.Name); ok {
// for op statefulset // for op statefulset
for _, pod := range pods { for _, pod := range pods {
if err := resourceStats.GetOpenPitrixStats(opName).GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod]); err != nil { // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
klog.Error(err) // and then set pod stats data, the direction is as follows:
return err // OpenPitrix field(create if not existed) -> statefulsets field(create if not existed) -> pod
} resourceStats.GetOpenPitrixStats(opName).GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod])
} }
} else if ok, appName := t.isAppComponent(ns, "daemonset", statefulset.Name); ok { } else if ok, appName := t.isAppComponent(ns, "daemonset", statefulset.Name); ok {
// for app statefulset // for app statefulset
for _, pod := range pods { for _, pod := range pods {
// aggregate order is from bottom(pods) to top(app), we should create outer field if not exists // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
// and then set pod stats data, the direction is as follows: // and then set pod stats data, the direction is as follows:
// app field(create if not existed) -> statefulsets field(create if not existed) -> pod // App field(create if not existed) -> statefulsets field(create if not existed) -> pod
if err := resourceStats.GetAppStats(appName).GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod]); err != nil { resourceStats.GetAppStats(appName).GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod])
klog.Error(err)
return err
}
} }
} else { } else {
// for k8s statefulset // for k8s statefulset
for _, pod := range pods { for _, pod := range pods {
// same as above, the direction is similar: // aggregate order is from bottom(pods) to top(app), we should create outer field if not exists
// k8s field(create if not existed) -> statefulsets field(create if not existed) -> pod // and then set pod stats data, the direction is as follows:
if err := resourceStats.GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod]); err != nil { // Statefulsets field(create if not existed) -> pod
klog.Error(err) resourceStats.GetStatefulsetStats(statefulset.Name).SetPodStats(pod, podsStats[pod])
return err
}
} }
} }
} }