cherry-pick(probe): initialize labels before probe start (#664)

- earlier the blockdevice labels map was initialized in the customtag probe which causes undeclared map, if the labels are used before using customtag probe. Now the label initialization happens before the probes are run. - chore(test): update unit test Signed-off-by: Akhil Mohan <[email protected]>
openebs-archive · Dec 24, 2021 · a1e8959 · a1e8959
1 parent 7c64d44
commit a1e8959
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/cmd/ndm_daemonset/controller/probe.go b/cmd/ndm_daemonset/controller/probe.go
@@ -112,6 +112,7 @@ func (c *Controller) ListProbe(requestedProbes ...string) []*Probe {
 func (c *Controller) FillBlockDeviceDetails(blockDevice *blockdevice.BlockDevice,
 	requestedProbes ...string) {
 	blockDevice.NodeAttributes = c.NodeAttributes
+	blockDevice.Labels = make(map[string]string)
 	selectedProbes := c.ListProbe(requestedProbes...)
 	for _, probe := range selectedProbes {
 		probe.FillBlockDeviceDetails(blockDevice)

diff --git a/cmd/ndm_daemonset/controller/probe_test.go b/cmd/ndm_daemonset/controller/probe_test.go
@@ -212,6 +212,7 @@ func TestFillDetails(t *testing.T) {
 
 	// create one fake Disk struct
 	expectedDr := &bd.BlockDevice{}
+	expectedDr.Labels = make(map[string]string)
 	expectedDr.DeviceAttributes.Model = fakeModel
 	expectedDr.DeviceAttributes.Serial = fakeSerial
 	expectedDr.DeviceAttributes.Vendor = fakeVendor

diff --git a/cmd/ndm_daemonset/probe/customtagprobe.go b/cmd/ndm_daemonset/probe/customtagprobe.go
@@ -96,9 +96,6 @@ func (ctp *customTagProbe) FillBlockDeviceDetails(bd *blockdevice.BlockDevice) {
 		case tagTypePath:
 			fieldToMatch = bd.DevPath
 		}
-		if bd.Labels == nil {
-			bd.Labels = make(map[string]string)
-		}
 		if util.IsMatchRegex(tag.regex, fieldToMatch) {
 			bd.Labels[kubernetes.BlockDeviceTagLabel] = tag.label
 			klog.Infof("Device: %s Label %s:%s added by custom tag probe", bd.DevPath, kubernetes.BlockDeviceTagLabel, tag.label)

diff --git a/cmd/ndm_daemonset/probe/customtagprobe_test.go b/cmd/ndm_daemonset/probe/customtagprobe_test.go
@@ -37,6 +37,7 @@ func TestCustomTagProbeFillBlockDeviceDetails(t *testing.T) {
 				Identifier: blockdevice.Identifier{
 					DevPath: "/dev/sda",
 				},
+				Labels: make(map[string]string),
 			},
 			customTags:     nil,
 			wantTagLabel:   "",
@@ -47,6 +48,7 @@ func TestCustomTagProbeFillBlockDeviceDetails(t *testing.T) {
 				Identifier: blockdevice.Identifier{
 					DevPath: "/dev/sda",
 				},
+				Labels: make(map[string]string),
 			},
 			customTags: []tag{
 				{
@@ -63,6 +65,7 @@ func TestCustomTagProbeFillBlockDeviceDetails(t *testing.T) {
 				Identifier: blockdevice.Identifier{
 					DevPath: "/dev/sdb",
 				},
+				Labels: make(map[string]string),
 			},
 			customTags: []tag{
 				{
@@ -79,6 +82,7 @@ func TestCustomTagProbeFillBlockDeviceDetails(t *testing.T) {
 				Identifier: blockdevice.Identifier{
 					DevPath: "/dev/sdb",
 				},
+				Labels: make(map[string]string),
 			},
 			customTags: []tag{
 				{