From e704346a7cf08368e6d1ea513ddd35c8edcf70ab Mon Sep 17 00:00:00 2001 From: hwchiu Date: Fri, 13 Jul 2018 02:04:46 +0000 Subject: [PATCH] Rename function and checn the error message Former-commit-id: 76405e78151f16b2c44fc12dc043f097f843b337 [formerly 76405e78151f16b2c44fc12dc043f097f843b337 [formerly 1f42819bacdb19ffa3fe28eee21c7a68326e5f47]] Former-commit-id: 970a5ee3d2adf600c829d704cf9d43f49b21bf9a Former-commit-id: 5230692ef1c9cba62749a870b3364af9697c1ba5 --- src/kubernetes/pods.go | 2 +- src/kubernetes/pods_test.go | 4 ++-- src/volume/volume.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kubernetes/pods.go b/src/kubernetes/pods.go index ab1174c2..71e32920 100644 --- a/src/kubernetes/pods.go +++ b/src/kubernetes/pods.go @@ -34,7 +34,7 @@ func (kc *KubeCtl) DeletePod(name string) error { return kc.Clientset.CoreV1().Pods(kc.Namespace).Delete(name, &options) } -func (kc *KubeCtl) DoesPodCompleted(pod *corev1.Pod) bool { +func (kc *KubeCtl) IsPodCompleted(pod *corev1.Pod) bool { switch pod.Status.Phase { case corev1.PodRunning, corev1.PodPending: return false diff --git a/src/kubernetes/pods_test.go b/src/kubernetes/pods_test.go index 75d6a859..1b4997b0 100644 --- a/src/kubernetes/pods_test.go +++ b/src/kubernetes/pods_test.go @@ -109,10 +109,10 @@ func (suite *KubeCtlPodTestSuite) TestDoesPodCompleted() { suite.NoError(err) } - run := suite.kubectl.DoesPodCompleted(&pods[0]) + run := suite.kubectl.IsPodCompleted(&pods[0]) suite.False(run) - run = suite.kubectl.DoesPodCompleted(&pods[1]) + run = suite.kubectl.IsPodCompleted(&pods[1]) suite.True(run) } diff --git a/src/volume/volume.go b/src/volume/volume.go index 5db76c30..cb958a1f 100644 --- a/src/volume/volume.go +++ b/src/volume/volume.go @@ -64,7 +64,7 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { pods := []entity.Pod{} err := session.FindAll(entity.PodCollectionName, bson.M{"volumes.name": volume.Name}, &pods) if err != nil { - return fmt.Errorf("Load the database fail:%v", err) + return fmt.Errorf("load the database fail:%v", err) } usedPod := []string{} @@ -75,13 +75,13 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { continue } - if !sp.KubeCtl.DoesPodCompleted(currentPod) { + if !sp.KubeCtl.IsPodCompleted(currentPod) { usedPod = append(usedPod, pod.Name) } } if len(usedPod) != 0 { podNames := strings.Join(usedPod, ",") - return fmt.Errorf("Delete the volume [%s] fail, since the followings pods still ust it: %s", volume.Name, podNames) + return fmt.Errorf("delete the volume [%s] fail, since the followings pods still ust it: %s", volume.Name, podNames) } return sp.KubeCtl.DeletePVC(volume.GetPVCName())