fix(mount): fix parsing /proc/cmdline (#516)

* fix parsing cmdline file when the device path is directly mentioned without identifier * add test case for cmdline path without identifier Signed-off-by: Akhil Mohan <[email protected]>
openebs-archive · Dec 10, 2020 · 38350d8 · 38350d8
1 parent c852b64
commit 38350d8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/deploy/ndm-operator.yaml b/deploy/ndm-operator.yaml
@@ -125,7 +125,7 @@ spec:
       # to detect disk attach and detach events using fd.
       hostNetwork: true
       hostPID: true
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-manager
         image: openebs/node-disk-manager:ci
@@ -226,7 +226,7 @@ spec:
       labels:
         name: node-disk-operator
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-operator
         image: openebs/node-disk-operator:ci
@@ -281,7 +281,7 @@ spec:
       labels:
         name: ndm-cluster-exporter
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: ndm-cluster-exporter
         image: openebs/node-disk-exporter:ci
@@ -322,7 +322,7 @@ spec:
       labels:
         name: ndm-node-exporter
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-exporter
         image: openebs/node-disk-exporter:ci

diff --git a/deploy/yamls/ndm-cluster-exporter.yaml b/deploy/yamls/ndm-cluster-exporter.yaml
@@ -18,7 +18,7 @@ spec:
       labels:
         name: ndm-cluster-exporter
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: ndm-cluster-exporter
         image: openebs/node-disk-exporter:ci

diff --git a/deploy/yamls/ndm-node-exporter.yaml b/deploy/yamls/ndm-node-exporter.yaml
@@ -17,7 +17,7 @@ spec:
       labels:
         name: ndm-node-exporter
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-exporter
         image: openebs/node-disk-exporter:ci

diff --git a/deploy/yamls/node-disk-manager.yaml b/deploy/yamls/node-disk-manager.yaml
@@ -26,7 +26,7 @@ spec:
       # to detect disk attach and detach events using fd.
       hostNetwork: true
       hostPID: true
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-manager
         image: openebs/node-disk-manager:ci

diff --git a/deploy/yamls/node-disk-operator.yaml b/deploy/yamls/node-disk-operator.yaml
@@ -16,7 +16,7 @@ spec:
       labels:
         name: node-disk-operator
     spec:
-      serviceAccountName: openebs-ndm-operator
+      serviceAccountName: openebs-maya-operator
       containers:
       - name: node-disk-operator
         image: openebs/node-disk-operator:ci

diff --git a/pkg/mount/mountutil.go b/pkg/mount/mountutil.go
@@ -191,6 +191,14 @@ func parseRootDeviceLink(file io.Reader) (string, error) {
 
 			rootSpec := strings.Split(arg[len(rootPrefix):], "=")
 
+			// if the expected format is not present, then we skip getting the root partition
+			if len(rootSpec) < 2 {
+				if strings.HasPrefix(rootSpec[0], "/dev") {
+					return rootSpec[0], nil
+				}
+				return "", ErrCouldNotFindRootDevice
+			}
+
 			identifierType := strings.ToLower(rootSpec[0])
 			identifier := rootSpec[1]
 

diff --git a/pkg/mount/mountutil_test.go b/pkg/mount/mountutil_test.go
@@ -266,6 +266,11 @@ func TestParseRootDeviceLink(t *testing.T) {
 			"/dev/disk/by-partuuid/325c5bfa-08a8-433c-bc62-2dd5255213fd",
 			nil,
 		},
+		"single line with root on dm device, (simulates cmdline in GKE)": {
+			"BOOT_IMAGE=/syslinux/vmlinuz.A root=/dev/dm-0",
+			"/dev/dm-0",
+			nil,
+		},
 	}
 
 	for name, test := range tests {