Skip to content

Commit

Permalink
Merge pull request #797 from iworkist/master
Browse files Browse the repository at this point in the history 
fix: call log position
  • Loading branch information
@powerkimhub
powerkimhub authored Oct 13, 2022
2 parents b54cc0f + 38095f9 commit 7cf2bf7
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 40 deletions.
38 changes: 17 additions & 21 deletions cloud-control-manager/cloud-driver/drivers/alibaba/resources/ClusterHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,24 @@ func (clusterHandler *AlibabaClusterHandler) CreateCluster(clusterReqInfo irs.Cl
cblogger.Info("Alibaba Cloud Driver: called CreateCluster()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, "CreateCluster()", "CreateCluster()")

start := call.Start()
// 클러스터 생성 요청을 JSON 요청으로 변환
payload, err := getClusterInfoJSON(clusterHandler, clusterReqInfo)
if err != nil {
err := fmt.Errorf("Failed to Get ClusterInfo JSON : %v", err)
cblogger.Error(err)
return irs.ClusterInfo{}, err
}

start := call.Start()
response_json_str, err := alibaba.CreateCluster(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, payload)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Create Cluster : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return irs.ClusterInfo{}, err
}
tempCalllogger.Info(call.String(callLogInfo))

// NodeGroup 생성 정보가 있는경우 생성을 시도한다.
// 현재는 생성 시도를 안한다. 생성하기로 결정되면 아래 주석을 풀어서 사용한다.
Expand Down Expand Up @@ -99,14 +98,14 @@ func (clusterHandler *AlibabaClusterHandler) ListCluster() ([]*irs.ClusterInfo,
start := call.Start()
clusters_json_str, err := alibaba.GetClusters(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Get Clusters : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return nil, err
}
tempCalllogger.Info(call.String(callLogInfo))

var clusters_json_obj map[string]interface{}
json.Unmarshal([]byte(clusters_json_str), &clusters_json_obj)
Expand All @@ -133,14 +132,14 @@ func (clusterHandler *AlibabaClusterHandler) GetCluster(clusterIID irs.IID) (irs
start := call.Start()
cluster_info, err := getClusterInfo(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Get ClusterInfo : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return irs.ClusterInfo{}, err
}
tempCalllogger.Info(call.String(callLogInfo))

return *cluster_info, nil
}
Expand All @@ -152,7 +151,6 @@ func (clusterHandler *AlibabaClusterHandler) DeleteCluster(clusterIID irs.IID) (
start := call.Start()
res, err := alibaba.DeleteCluster(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Delete Cluster : %v", err)
cblogger.Error(err)
Expand All @@ -161,6 +159,7 @@ func (clusterHandler *AlibabaClusterHandler) DeleteCluster(clusterIID irs.IID) (
return false, err
}
cblogger.Info(res)
tempCalllogger.Info(call.String(callLogInfo))

return true, nil
}
Expand All @@ -169,6 +168,7 @@ func (clusterHandler *AlibabaClusterHandler) AddNodeGroup(clusterIID irs.IID, no
cblogger.Info("Alibaba Cloud Driver: called AddNodeGroup()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, clusterIID.NameId, "AddNodeGroup()")

start := call.Start()
// 노드 그룹 생성 요청을 JSON 요청으로 변환
payload, err := getNodeGroupJSONString(clusterHandler, clusterIID, nodeGroupReqInfo)
if err != nil {
Expand All @@ -177,17 +177,16 @@ func (clusterHandler *AlibabaClusterHandler) AddNodeGroup(clusterIID irs.IID, no
return irs.NodeGroupInfo{}, err
}

start := call.Start()
result_json_str, err := alibaba.CreateNodeGroup(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, payload)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Create NodeGroup : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return irs.NodeGroupInfo{}, err
}
tempCalllogger.Info(call.String(callLogInfo))

var result_json_obj map[string]interface{}
json.Unmarshal([]byte(result_json_str), &result_json_obj)
Expand All @@ -206,19 +205,18 @@ func (clusterHandler *AlibabaClusterHandler) ListNodeGroup(clusterIID irs.IID) (
cblogger.Info("Alibaba Cloud Driver: called ListNodeGroup()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, clusterIID.NameId, "ListNodeGroup()")

node_group_info_list := []*irs.NodeGroupInfo{}

start := call.Start()
node_group_info_list := []*irs.NodeGroupInfo{}
node_groups_json_str, err := alibaba.ListNodeGroup(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to List NodeGroup : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return node_group_info_list, err
}
tempCalllogger.Info(call.String(callLogInfo))

var node_groups_json_obj map[string]interface{}
json.Unmarshal([]byte(node_groups_json_str), &node_groups_json_obj)
Expand All @@ -244,14 +242,14 @@ func (clusterHandler *AlibabaClusterHandler) GetNodeGroup(clusterIID irs.IID, no
start := call.Start()
temp, err := getNodeGroupInfo(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, nodeGroupIID.SystemId)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Get NodeGroupInfo : %v", err)
cblogger.Error(err)
callLogInfo.ErrorMSG = err.Error()
tempCalllogger.Error(call.String(callLogInfo))
return irs.NodeGroupInfo{}, err
}
tempCalllogger.Info(call.String(callLogInfo))

return *temp, nil
}
Expand All @@ -260,13 +258,11 @@ func (clusterHandler *AlibabaClusterHandler) SetNodeGroupAutoScaling(clusterIID
cblogger.Info("Alibaba Cloud Driver: called SetNodeGroupAutoScaling()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, clusterIID.NameId, "SetNodeGroupAutoScaling()")

start := call.Start()
temp := `{"auto_scaling":{"enable":%t}}`
body := fmt.Sprintf(temp, on)

start := call.Start()
res, err := alibaba.ModifyNodeGroup(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, nodeGroupIID.SystemId, body)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Modify NodeGroup : %v", err)
cblogger.Error(err)
Expand All @@ -275,6 +271,7 @@ func (clusterHandler *AlibabaClusterHandler) SetNodeGroupAutoScaling(clusterIID
return false, err
}
cblogger.Info(res)
tempCalllogger.Info(call.String(callLogInfo))

return true, nil
}
Expand All @@ -283,13 +280,12 @@ func (clusterHandler *AlibabaClusterHandler) ChangeNodeGroupScaling(clusterIID i
cblogger.Info("Alibaba Cloud Driver: called ChangeNodeGroupScaling()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, clusterIID.NameId, "ChangeNodeGroupScaling()")

start := call.Start()
// desired_size is not supported in alibaba with auto scaling mode
temp := `{"auto_scaling":{"max_instances":%d,"min_instances":%d}}`
body := fmt.Sprintf(temp, maxNodeSize, minNodeSize)
start := call.Start()
res, err := alibaba.ModifyNodeGroup(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, nodeGroupIID.SystemId, body)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Modify NodeGroup : %v", err)
cblogger.Error(err)
Expand All @@ -298,6 +294,7 @@ func (clusterHandler *AlibabaClusterHandler) ChangeNodeGroupScaling(clusterIID i
return irs.NodeGroupInfo{}, err
}
cblogger.Info(res)
tempCalllogger.Info(call.String(callLogInfo))

node_group_info, err := getNodeGroupInfo(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, nodeGroupIID.SystemId)
if err != nil {
Expand All @@ -316,7 +313,6 @@ func (clusterHandler *AlibabaClusterHandler) RemoveNodeGroup(clusterIID irs.IID,
start := call.Start()
res, err := alibaba.DeleteNodeGroup(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, nodeGroupIID.SystemId)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Delete NodeGroup : %v", err)
cblogger.Error(err)
Expand All @@ -325,6 +321,7 @@ func (clusterHandler *AlibabaClusterHandler) RemoveNodeGroup(clusterIID irs.IID,
return false, err
}
cblogger.Info(res)
tempCalllogger.Info(call.String(callLogInfo))

return true, nil
}
Expand All @@ -333,13 +330,11 @@ func (clusterHandler *AlibabaClusterHandler) UpgradeCluster(clusterIID irs.IID,
cblogger.Info("Alibaba Cloud Driver: called UpgradeCluster()")
callLogInfo := getCallLogScheme(clusterHandler.RegionInfo.Region, call.CLUSTER, clusterIID.NameId, "UpgradeCluster()")

start := call.Start()
temp := `{"next_version" : "%s"}`
body := fmt.Sprintf(temp, newVersion)

start := call.Start()
res, err := alibaba.UpgradeCluster(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId, body)
callLogInfo.ElapsedTime = call.Elapsed(start)
tempCalllogger.Info(call.String(callLogInfo))
if err != nil {
err := fmt.Errorf("Failed to Upgrade Cluster : %v", err)
cblogger.Error(err)
Expand All @@ -348,6 +343,7 @@ func (clusterHandler *AlibabaClusterHandler) UpgradeCluster(clusterIID irs.IID,
return irs.ClusterInfo{}, err
}
cblogger.Info(res)
tempCalllogger.Info(call.String(callLogInfo))

clusterInfo, err := getClusterInfo(clusterHandler.CredentialInfo.ClientId, clusterHandler.CredentialInfo.ClientSecret, clusterHandler.RegionInfo.Region, clusterIID.SystemId)
if err != nil {
Expand Down
Loading

0 comments on commit 7cf2bf7

Please sign in to comment.