fix: volume creation failed in eks cluster due to different hostname …

…and nodename

Signed-off-by: Abhinandan Purkait <[email protected]>

mayastor/src/bin/mayastor.rs

@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate tracing;
 
-use std::path::Path;
+use std::{env, path::Path};
 
 use futures::future::FutureExt;
 use structopt::StructOpt;
@@ -32,10 +32,14 @@ fn start_tokio_runtime(args: &MayastorCliArgs) {
     let grpc_address = grpc::endpoint(args.grpc_endpoint.clone());
     let registration_addr = args.registration_endpoint.clone();
     let rpc_address = args.rpc_address.clone();
-    let node_name = args
-        .node_name
-        .clone()
-        .unwrap_or_else(|| "mayastor-node".into());
+    // In case we do not have the node-name provided we would set the node name
+    // as the hostname(env always present), because the csi-controller adds
+    // the hostname in allowed nodes in the topology and in case there is
+    // mismatch, for ex, in case of EKS clusters where hostname and
+    // node name differ volume wont be created, so we set it to hostname.
+    let node_name = args.node_name.clone().unwrap_or_else(|| {
+        env::var("HOSTNAME").unwrap_or_else(|_| "mayastor-node".into())
+    });
 
     let persistent_store_endpoint = args.persistent_store_endpoint.clone();
 

mayastor/src/core/env.rs

@@ -1,4 +1,5 @@
 use std::{
+    env,
     ffi::CString,
     os::raw::{c_char, c_void},
     pin::Pin,
@@ -373,7 +374,9 @@ impl MayastorEnvironment {
             grpc_endpoint: Some(grpc::endpoint(args.grpc_endpoint)),
             registration_endpoint: args.registration_endpoint,
             persistent_store_endpoint: args.persistent_store_endpoint,
-            node_name: args.node_name.unwrap_or_else(|| "mayastor-node".into()),
+            node_name: args.node_name.unwrap_or_else(|| {
+                env::var("HOSTNAME").unwrap_or_else(|_| "mayastor-node".into())
+            }),
             mayastor_config: args.mayastor_config,
             pool_config: args.pool_config,
             log_component: args.log_components,