Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(instance-manager): missing required labels after manager crashed (backport #3164) #3167

Merged
merged 2 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion controller/node_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,17 @@ func (nc *NodeController) syncInstanceManagers(node *longhorn.Node) error {
}

log.Infof("Creating default instance manager %v, image: %v, dataEngine: %v", imName, defaultInstanceManagerImage, dataEngine)
if _, err := nc.createInstanceManager(node, imName, defaultInstanceManagerImage, imType, dataEngine); err != nil {
_, err = nc.createInstanceManager(node, imName, defaultInstanceManagerImage, imType, dataEngine)
if err != nil {
if apierrors.IsAlreadyExists(err) {
log.WithError(err).Warnf("Deleting instance manager %v because it cannot be obtained by selector labels", imName)
if err := nc.ds.DeleteInstanceManager(imName); err != nil {
return err
}

nc.enqueueNode(node)
return nil
}
return err
}
}
Expand Down
98 changes: 98 additions & 0 deletions controller/node_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ package controller

import (
"context"
"fmt"
"strings"

"github.com/sirupsen/logrus"
. "gopkg.in/check.v1"

corev1 "k8s.io/api/core/v1"
apiextensionsfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
fake "k8s.io/client-go/kubernetes/fake"
Expand Down Expand Up @@ -1831,6 +1833,102 @@ func (s *NodeControllerSuite) TestNoEventOnUnknownTrueNodeCondition(c *C) {
s.checkEvents(c, expectation)
}

func (s *NodeControllerSuite) TestSyncInstanceManagers(c *C) {
// Skip the Lister check that occurs on creation of an Instance Manager.
datastore.SkipListerCheck = true

var err error

fixture := &NodeControllerFixture{
lhNodes: map[string]*longhorn.Node{
TestNode1: newNode(TestNode1, TestNamespace, true, longhorn.ConditionStatusUnknown, ""),
},
lhSettings: map[string]*longhorn.Setting{
string(types.SettingNameDefaultInstanceManagerImage): newDefaultInstanceManagerImageSetting(),
},
}

s.initTest(c, fixture)

defaultInstanceManager := DefaultInstanceManagerTestNode1.DeepCopy()
defaultInstanceManagerName, err := types.GetInstanceManagerName(
defaultInstanceManager.Spec.Type,
defaultInstanceManager.Spec.NodeID,
defaultInstanceManager.Spec.Image,
string(defaultInstanceManager.Spec.DataEngine))
c.Assert(err, IsNil)

defaultInstanceManager.Name = defaultInstanceManagerName

type instanceManagerCases struct {
existingInstanceManagers map[string]*longhorn.InstanceManager
isLabeled bool
isExpectError bool
}
testCases := map[string]instanceManagerCases{
"instance manager should be deleted and requeue node when instance manager labels are missing": {
existingInstanceManagers: map[string]*longhorn.InstanceManager{
defaultInstanceManagerName: defaultInstanceManager,
},
isLabeled: false,
isExpectError: false,
},
}

for testName, testCase := range testCases {
fmt.Printf("testing %v", testName)

node := fixture.lhNodes[TestNode1]

if !testCase.isLabeled {
existingInstanceManagers := testCase.existingInstanceManagers
for name := range existingInstanceManagers {
existingInstanceManagers[name].Labels = nil
}
fixture.lhInstanceManagers = existingInstanceManagers
}

for _, instanceManager := range testCase.existingInstanceManagers {
im, err := s.lhClient.LonghornV1beta2().InstanceManagers(TestNamespace).Get(context.TODO(), instanceManager.Name, metav1.GetOptions{})
if err != nil && !apierrors.IsNotFound(err) {
c.Assert(err, IsNil)
}
if im != nil {
err := s.lhClient.LonghornV1beta2().InstanceManagers(TestNamespace).Delete(context.TODO(), instanceManager.Name, metav1.DeleteOptions{})
c.Assert(err, IsNil)
}

im, err = s.lhClient.LonghornV1beta2().InstanceManagers(TestNamespace).Create(context.TODO(), instanceManager, metav1.CreateOptions{})
c.Assert(err, IsNil)
c.Assert(im, NotNil)

err = s.lhInstanceManagerIndexer.Add(im)
c.Assert(err, IsNil)
}

err = s.controller.syncInstanceManagers(node)
if len(testCase.existingInstanceManagers) > 0 {
instanceManagers, err := s.lhClient.LonghornV1beta2().InstanceManagers(TestNamespace).List(context.TODO(), metav1.ListOptions{})
c.Assert(err, IsNil)
c.Assert(len(instanceManagers.Items), Equals, 0)
} else {
c.Assert(err, IsNil)
}

// Simulate the enqueue.
err = s.controller.syncInstanceManagers(node)
if testCase.isExpectError {
c.Assert(err, NotNil)
continue
}
c.Assert(err, IsNil)

instanceManagers, err := s.lhClient.LonghornV1beta2().InstanceManagers(TestNamespace).List(context.TODO(), metav1.ListOptions{})
c.Assert(err, IsNil)
c.Assert(len(instanceManagers.Items), Equals, len(testCase.existingInstanceManagers))
}
}

// -- Helpers --

func (s *NodeControllerSuite) checkNodeConditions(c *C, expectation *NodeControllerExpectation, node *longhorn.Node) {
Expand Down