gluster-block: adopt to targetclid usage

Requires: open-iscsi/targetcli-fb#132 Signed-off-by: Prasanna Kumar Kalever <[email protected]>
pkalever · Sep 26, 2019 · 2605b43 · 2605b43
1 parent 08ebf97
commit 2605b43
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/daemon/gluster-blockd.c b/daemon/gluster-blockd.c
@@ -472,6 +472,7 @@ blockNodeSanityCheck(void)
 {
   int ret;
   char *global_opts;
+  char *tmp;
 
 
   /*
@@ -508,6 +509,25 @@ blockNodeSanityCheck(void)
   if (GB_ASPRINTF(&global_opts, GB_TGCLI_GLOBALS, gbConf->configShellLogFile) == -1) {
     return ENOMEM;
   }
+
+  /* Check if targetclid is running */
+  tmp = global_opts;
+  ret = gbRunner("ps aux ww | grep -w '[t]argetclid' > /dev/null");
+  if (ret) {
+    LOG("mgmt", GB_LOG_WARNING, "targetclid not running, using targetcli");
+
+    if (GB_ASPRINTF(&global_opts, "%s auto_use_daemon=false", tmp) == -1) {
+      GB_FREE(tmp);
+      return ENOMEM;
+    }
+  } else {
+    if (GB_ASPRINTF(&global_opts, "%s auto_use_daemon=true", tmp) == -1) {
+      GB_FREE(tmp);
+      return ENOMEM;
+    }
+  }
+  GB_FREE(tmp);
+
   /* Set targetcli globals */
   ret = gbRunner(global_opts);
   GB_FREE(global_opts);

diff --git a/rpc/block_create.c b/rpc/block_create.c
@@ -672,7 +672,7 @@ block_create_common(blockCreate *blk, char *control, char *volServer, char *prio
     goto out;
   }
 
-  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nEOF", tmp, save) == -1) {
+  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nexit\nEOF", tmp, save) == -1) {
     goto out;
   }
   GB_FREE(tmp);

diff --git a/rpc/block_delete.c b/rpc/block_delete.c
@@ -483,7 +483,7 @@ block_delete_1_svc_st(blockDelete *blk, struct svc_req *rqstp)
     goto out;
   }
 
-  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nEOF", backstore, iqn) == -1) {
+  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nexit\nEOF", backstore, iqn) == -1) {
     goto out;
   }
 

diff --git a/rpc/block_modify.c b/rpc/block_modify.c
@@ -1031,7 +1031,7 @@ block_modify_1_svc_st(blockModify *blk, struct svc_req *rqstp)
     goto out;
   }
 
-  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nEOF", tmp, save) == -1) {
+  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nexit\nEOF", tmp, save) == -1) {
     goto out;
   }
 
@@ -1084,7 +1084,7 @@ block_modify_size_1_svc_st(blockModifySize *blk, struct svc_req *rqstp)
     goto out;
   }
 
-  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nEOF", tmp, save) == -1) {
+  if (GB_ASPRINTF(&exec, "targetcli <<EOF\n%s\n%s\nexit\nEOF", tmp, save) == -1) {
     goto out;
   }
 

diff --git a/rpc/block_replace.c b/rpc/block_replace.c
@@ -817,7 +817,7 @@ block_replace_1_svc_st(blockReplace *blk, struct svc_req *rqstp)
   }
 
   if (GB_ASPRINTF(&exec,
-                  "targetcli <<EOF\n%s delete %s ip_port=3260\n%s create %s\n%s\nEOF",
+                  "targetcli <<EOF\n%s delete %s ip_port=3260\n%s create %s\n%s\nexit\nEOF",
                   path, blk->ripaddr, path, blk->ipaddr, save) == -1) {
     goto out;
   }

diff --git a/systemd/gluster-block-target.service.in b/systemd/gluster-block-target.service.in
@@ -11,7 +11,7 @@
 Conflicts=target.service
 Requisite=glusterd.service
 BindsTo=tcmu-runner.service
-After=glusterd.service tcmu-runner.service
+After=glusterd.service tcmu-runner.service targetclid.service
 
 [Service]
 ExecStop=

diff --git a/systemd/gluster-blockd.service.in b/systemd/gluster-blockd.service.in
@@ -3,6 +3,7 @@ Description=Gluster block storage utility
 Requisite=glusterd.service
 Requires=rpcbind.service
 BindsTo=gluster-block-target.service
+Wants=targetclid.service
 After=gluster-block-target.service rpcbind.service
 
 [Service]