From 8e773612ca959eccd4a241949040d9f44f2f2692 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 28 Aug 2018 15:15:57 -0500 Subject: [PATCH 1/2] Remove unnecessary "-id" from OSD pod names The -id portion of the name is unnecessary and inconsistent with the other pod names. Signed-off-by: Sage Weil --- Documentation/ceph-quickstart.md | 4 ++-- Documentation/upgrade.md | 12 ++++++------ pkg/operator/ceph/cluster/osd/osd.go | 2 +- pkg/operator/ceph/cluster/osd/osd_test.go | 10 +++++----- pkg/operator/ceph/cluster/osd/pod_test.go | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Documentation/ceph-quickstart.md b/Documentation/ceph-quickstart.md index 9a77b7249..a907d0436 100644 --- a/Documentation/ceph-quickstart.md +++ b/Documentation/ceph-quickstart.md @@ -91,8 +91,8 @@ rook-ceph-mgr-a-9c44495df-ln9sq 1/1 Running 0 1m rook-ceph-mon-a-69fb9c78cd-58szd 1/1 Running 0 2m rook-ceph-mon-b-cf4ddc49c-c756f 1/1 Running 0 2m rook-ceph-mon-c-5b467747f4-8cbmv 1/1 Running 0 2m -rook-ceph-osd-id-0-f6549956d-6z294 1/1 Running 0 1m -rook-ceph-osd-id-1-5b96b56684-r7zsp 1/1 Running 0 1m +rook-ceph-osd-0-f6549956d-6z294 1/1 Running 0 1m +rook-ceph-osd-1-5b96b56684-r7zsp 1/1 Running 0 1m rook-ceph-osd-prepare-mynode-ftt57 0/1 Completed 0 1m ``` diff --git a/Documentation/upgrade.md b/Documentation/upgrade.md index 050e100d1..e54280610 100644 --- a/Documentation/upgrade.md +++ b/Documentation/upgrade.md @@ -333,12 +333,12 @@ Once they have all been started, you will see the pods running. If they do not s ``` $ kubectl -n rook get pod -l app=rook-ceph-osd NAME READY STATUS RESTARTS AGE -rook-ceph-osd-id-0-5675d6f5f8-r5b2g 1/1 Running 6 6m -rook-ceph-osd-id-1-69cc6bd8f6-59tcn 1/1 Running 6 6m -rook-ceph-osd-id-2-74b7cf67c5-mtl92 1/1 Running 6 6m -rook-ceph-osd-id-3-757b845567-bk259 1/1 Running 6 6m -rook-ceph-osd-id-4-6cccb5f7d8-wxl2w 1/1 Running 6 6m -rook-ceph-osd-id-5-5b8598cc9f-2pnfb 1/1 Running 6 6m +rook-ceph-osd-0-5675d6f5f8-r5b2g 1/1 Running 6 6m +rook-ceph-osd-1-69cc6bd8f6-59tcn 1/1 Running 6 6m +rook-ceph-osd-2-74b7cf67c5-mtl92 1/1 Running 6 6m +rook-ceph-osd-3-757b845567-bk259 1/1 Running 6 6m +rook-ceph-osd-4-6cccb5f7d8-wxl2w 1/1 Running 6 6m +rook-ceph-osd-5-5b8598cc9f-2pnfb 1/1 Running 6 6m ``` ### Ceph Manager diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index 845d55f79..9804d02aa 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -46,7 +46,7 @@ const ( appName = "rook-ceph-osd" prepareAppName = "rook-ceph-osd-prepare" prepareAppNameFmt = "rook-ceph-osd-prepare-%s" - osdAppNameFmt = "rook-ceph-osd-id-%d" + osdAppNameFmt = "rook-ceph-osd-%d" appNameFmt = "rook-ceph-osd-%s" osdLabelKey = "ceph-osd-id" clusterAvailableSpaceReserve = 0.05 diff --git a/pkg/operator/ceph/cluster/osd/osd_test.go b/pkg/operator/ceph/cluster/osd/osd_test.go index 1827cc941..206498437 100644 --- a/pkg/operator/ceph/cluster/osd/osd_test.go +++ b/pkg/operator/ceph/cluster/osd/osd_test.go @@ -267,15 +267,15 @@ func TestDiscoverOSDs(t *testing.T) { assert.Equal(t, 2, len(discovered)) assert.Equal(t, 2, len(discovered[node1])) - if discovered[node1][0].Name == "rook-ceph-osd-id-0" { - assert.Equal(t, "rook-ceph-osd-id-101", discovered[node1][1].Name) + if discovered[node1][0].Name == "rook-ceph-osd-0" { + assert.Equal(t, "rook-ceph-osd-101", discovered[node1][1].Name) } else { - assert.Equal(t, "rook-ceph-osd-id-101", discovered[node1][0].Name) - assert.Equal(t, "rook-ceph-osd-id-0", discovered[node1][1].Name) + assert.Equal(t, "rook-ceph-osd-101", discovered[node1][0].Name) + assert.Equal(t, "rook-ceph-osd-0", discovered[node1][1].Name) } assert.Equal(t, 1, len(discovered[node2])) - assert.Equal(t, "rook-ceph-osd-id-23", discovered[node2][0].Name) + assert.Equal(t, "rook-ceph-osd-23", discovered[node2][0].Name) } func TestAddNodeFailure(t *testing.T) { diff --git a/pkg/operator/ceph/cluster/osd/pod_test.go b/pkg/operator/ceph/cluster/osd/pod_test.go index b2876a475..3c1ebf723 100644 --- a/pkg/operator/ceph/cluster/osd/pod_test.go +++ b/pkg/operator/ceph/cluster/osd/pod_test.go @@ -77,7 +77,7 @@ func testPodDevices(t *testing.T, dataDir, deviceName string, allDevices bool) { deployment, err := c.makeDeployment(n.Name, devices, n.Selection, v1.ResourceRequirements{}, config.StoreConfig{}, "", n.Location, osd) assert.Nil(t, err) assert.NotNil(t, deployment) - assert.Equal(t, "rook-ceph-osd-id-0", deployment.Name) + assert.Equal(t, "rook-ceph-osd-0", deployment.Name) assert.Equal(t, c.Namespace, deployment.Namespace) assert.Equal(t, "mysa", deployment.Spec.Template.Spec.ServiceAccountName) assert.Equal(t, int32(1), *(deployment.Spec.Replicas)) @@ -289,7 +289,7 @@ func TestHostNetwork(t *testing.T) { assert.NotNil(t, r) assert.Nil(t, err) - assert.Equal(t, "rook-ceph-osd-id-0", r.ObjectMeta.Name) + assert.Equal(t, "rook-ceph-osd-0", r.ObjectMeta.Name) assert.Equal(t, true, r.Spec.Template.Spec.HostNetwork) assert.Equal(t, v1.DNSClusterFirstWithHostNet, r.Spec.Template.Spec.DNSPolicy) } From c0af417b004fa505e279133fee1489c0b0705b7a Mon Sep 17 00:00:00 2001 From: travisn Date: Fri, 31 Aug 2018 09:45:22 -0600 Subject: [PATCH 2/2] osd: delete legacy deployment with -id in the name Signed-off-by: travisn --- pkg/operator/ceph/cluster/osd/osd.go | 12 +++++++++- pkg/operator/ceph/cluster/osd/osd_test.go | 29 +++++++++++++++++++++++ pkg/operator/k8sutil/pod.go | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index 9804d02aa..72bb4dd85 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -46,8 +46,8 @@ const ( appName = "rook-ceph-osd" prepareAppName = "rook-ceph-osd-prepare" prepareAppNameFmt = "rook-ceph-osd-prepare-%s" + legacyAppNameFmt = "rook-ceph-osd-id-%d" osdAppNameFmt = "rook-ceph-osd-%d" - appNameFmt = "rook-ceph-osd-%s" osdLabelKey = "ceph-osd-id" clusterAvailableSpaceReserve = 0.05 defaultServiceAccountName = "rook-ceph-cluster" @@ -341,6 +341,11 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig } continue } + + if err = c.deleteDeploymentWithLegacyName(osd.ID); err != nil { + logger.Warningf("failed to delete legacy osd deployment. %+v", err) + } + _, err = c.context.Clientset.Extensions().Deployments(c.Namespace).Create(dp) if err != nil { if !errors.IsAlreadyExists(err) { @@ -362,6 +367,11 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig } } +func (c *Cluster) deleteDeploymentWithLegacyName(osdID int) error { + legacyName := fmt.Sprintf(legacyAppNameFmt, osdID) + return k8sutil.DeleteDeployment(c.context.Clientset, c.Namespace, legacyName) +} + func (c *Cluster) handleRemovedNodes(config *provisionConfig) { // find all removed nodes (if any) and start orchestration to remove them from the cluster removedNodes, err := c.findRemovedNodes() diff --git a/pkg/operator/ceph/cluster/osd/osd_test.go b/pkg/operator/ceph/cluster/osd/osd_test.go index 206498437..f6251f5ca 100644 --- a/pkg/operator/ceph/cluster/osd/osd_test.go +++ b/pkg/operator/ceph/cluster/osd/osd_test.go @@ -87,6 +87,35 @@ func createNode(nodeName string, condition v1.NodeConditionType, clientset *fake return err } +func TestLegacyDeployment(t *testing.T) { + clientset := fake.NewSimpleClientset() + c := New(&clusterd.Context{Clientset: clientset}, "ns", "myversion", "", + rookalpha.StorageScopeSpec{}, "", rookalpha.Placement{}, false, v1.ResourceRequirements{}, metav1.OwnerReference{}) + + osdID := 23 + d := &extensions.Deployment{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf(legacyAppNameFmt, osdID), Namespace: c.Namespace}} + _, err := clientset.Extensions().Deployments(c.Namespace).Create(d) + require.Nil(t, err) + + // delete the deployment + assert.Nil(t, c.deleteDeploymentWithLegacyName(osdID)) + deployments, err := clientset.Extensions().Deployments(c.Namespace).List(metav1.ListOptions{}) + assert.Nil(t, err) + assert.Equal(t, 0, len(deployments.Items)) + + // return success if the deployment doesn't exist + assert.Nil(t, c.deleteDeploymentWithLegacyName(osdID)) + + // don't delete the newer deployment name + d = &extensions.Deployment{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf(osdAppNameFmt, osdID), Namespace: c.Namespace}} + _, err = clientset.Extensions().Deployments(c.Namespace).Create(d) + require.Nil(t, err) + assert.Nil(t, c.deleteDeploymentWithLegacyName(osdID)) + deployments, err = clientset.Extensions().Deployments(c.Namespace).List(metav1.ListOptions{}) + assert.Nil(t, err) + assert.Equal(t, 1, len(deployments.Items)) +} + func TestAddRemoveNode(t *testing.T) { // create a storage spec with the given nodes/devices/dirs nodeName := "node8230" diff --git a/pkg/operator/k8sutil/pod.go b/pkg/operator/k8sutil/pod.go index 8a4e4dfa1..71d466ee0 100644 --- a/pkg/operator/k8sutil/pod.go +++ b/pkg/operator/k8sutil/pod.go @@ -173,7 +173,7 @@ func GetPodPhaseMap(pods *v1.PodList) map[v1.PodPhase][]string { // DeleteDeployment makes a best effort at deleting a deployment and its pods, then waits for them to be deleted func DeleteDeployment(clientset kubernetes.Interface, namespace, name string) error { - logger.Infof("removing %s deployment if it exists", name) + logger.Debugf("removing %s deployment if it exists", name) deleteAction := func(options *metav1.DeleteOptions) error { return clientset.ExtensionsV1beta1().Deployments(namespace).Delete(name, options) }