AutoScaling: adding status type

pkg/apis/pingcap/v1alpha1/tidbclusterautoscaler_types.go

@@ -149,6 +149,43 @@ type TidbMonitorRef struct {
  Name string `json:"name"`
 }
 
-// TODO: sync status
+// BasicAutoScalerSpec describes the basic status for auto-scaling
+type BaseAutoScalerStatus struct {
+ // name is the name of the given metric
+ Name string `json:"name,omitempty"`
+
+ // CurrentValue is the current value of the metric.
+ CurrentValue float64 `json:"currentValue,omitempty"`
+
+ // TargetValue is the target value of the metric.
+ TargetValue float64 `json:"targetValue,omitempty"`
+
+ // lastScaleTime is the last time the HorizontalPodAutoscaler scaled the number of pods,
+ // used by the autoscaler to control how often the number of pods is changed.
+ // +optional
+ LastScaleTime string `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"`
+
+ // currentReplicas is current number of replicas of pods managed by this autoscaler,
+ // as last seen by the autoscaler.
+ CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"`
+
+ // desiredReplicas is the desired number of replicas of pods managed by this autoscaler,
+ // as last calculated by the autoscaler.
+ DesiredReplicas int32 `json:"desiredReplicas" protobuf:"varint,4,opt,name=desiredReplicas"`
+}
+
+// TiKVAutoScalerStatus describes the status for tikv auto-scaling
+type TiKVAutoScalerStatus struct {
+ BaseAutoScalerStatus `json:"tikv,omitempty"`
+}
+
+// TiDBAutoScalerStatus describes the status for tidb auto-scaling
+type TiDBAutoScalerStatus struct {
+ BaseAutoScalerStatus `json:"tidb,omitempty"`
+}
+
+// TidbClusterAutoSclaerStatus describes the status for TidbClusterAutoScaler
 type TidbClusterAutoSclaerStatus struct {
+ TikvStatus TiKVAutoScalerStatus `json:"tikv,omitempty"`
+ TiDBStatus TiDBAutoScalerStatus `json:"tidb,omitempty"`
 }

pkg/autoscaler/autoscaler/calculate/cpu.go

@@ -15,6 +15,7 @@ package calculate
 
 import (
  "fmt"
+ "k8s.io/klog"
  "time"
 
  "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
@@ -65,6 +66,24 @@ func CalculateRecomendedReplicasByCpuCosts(tac *v1alpha1.TidbClusterAutoScaler,
  if err != nil {
  return -1, err
  }
+
+ switch memberType {
+ case v1alpha1.TiDBMemberType:
+ tac.Status.TiDBStatus.Name = string(MetricTypeCPU)
+ tac.Status.TiDBStatus.CurrentValue = cpuSecsTotal
+ tac.Status.TiDBStatus.TargetValue = expectedCpuSecsTotal
+ tac.Status.TiDBStatus.CurrentReplicas = int32(currentReplicas)
+ tac.Status.TiDBStatus.DesiredReplicas = rc
+ case v1alpha1.TiKVMemberType:
+ tac.Status.TikvStatus.Name = string(MetricTypeCPU)
+ tac.Status.TikvStatus.CurrentValue = cpuSecsTotal
+ tac.Status.TikvStatus.TargetValue = expectedCpuSecsTotal
+ tac.Status.TikvStatus.CurrentReplicas = int32(currentReplicas)
+ tac.Status.TikvStatus.DesiredReplicas = rc
+ default:
+ klog.Errorf("unsupport type - %s", memberType)
+ }
+
  return rc, nil
 }
 

pkg/autoscaler/autoscaler/tidb_autoscaler.go

@@ -71,6 +71,7 @@ func syncTiDBAfterCalculated(tc *v1alpha1.TidbCluster, tac *v1alpha1.TidbCluster
 func updateTcTiDBIfScale(tc *v1alpha1.TidbCluster, tac *v1alpha1.TidbClusterAutoScaler, recommendedReplicas int32) error {
  tac.Annotations[label.AnnTiDBLastAutoScalingTimestamp] = fmt.Sprintf("%d", time.Now().Unix())
  tc.Spec.TiDB.Replicas = recommendedReplicas
+ tac.Status.TikvStatus.LastScaleTime = time.Now().Format(time.RFC3339)
  return nil
 }
 

pkg/autoscaler/autoscaler/tikv_autoscaler.go

@@ -100,6 +100,7 @@ func updateTcTiKVIfScale(tc *v1alpha1.TidbCluster, tac *v1alpha1.TidbClusterAuto
  }
  }
  tc.Spec.TiKV.Replicas = recommendedReplicas
+ tac.Status.TikvStatus.LastScaleTime = time.Now().Format(time.RFC3339)
  return nil
 }