From 245ee93f275301ad7f277b37614a30853d9def36 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Sun, 19 Feb 2017 14:40:12 +0530 Subject: gluster-block: refactor return values Signed-off-by: Prasanna Kumar Kalever --- README.md | 3 +- cli/gluster-block.c | 10 +-- configure.ac | 2 +- daemon/gluster-blockd.c | 2 +- rpc/block_svc_routines.c | 224 ++++++++++++++++++++++++++++++++--------------- rpc/glfs-operations.c | 21 ++++- utils/common.c | 10 +-- utils/common.h | 2 +- utils/utils.h | 2 + 9 files changed, 189 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index 9a683f8..c1bc895 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,7 @@ commands and arguments: 192.168.1.14: Initiator, iSCSI client

Execute gluster-block CLI from any of the 3 nodes where glusterd and gluster-blockd are running
Create a gluster volume by pooling 3 nodes (192.168.1.11, 192.168.1.12 and 192.168.1.13)
-Read More on how to [create a gluster volume](https://access.redhat.com/documentation/en-US/Red_Hat_Storage/2.1/html/Administration_Guide/sect-User_Guide-Setting_Volumes-Replicated.html) -* +Read More on how to [create a gluster volume](https://access.redhat.com/documentation/en-US/Red_Hat_Storage/2.1/html/Administration_Guide/sect-User_Guide-Setting_Volumes-Replicated.html)* 
 Create 1G gluster block storage
diff --git a/cli/gluster-block.c b/cli/gluster-block.c
index 440fe91..d8883ff 100644
--- a/cli/gluster-block.c
+++ b/cli/gluster-block.c
@@ -69,9 +69,9 @@ glusterBlockCliRPC_1(void *cobj, clioperations opt, char **out)
     goto out;
   }
 
-  clnt = clntunix_create ((struct sockaddr_un *) &saun,
-                          GLUSTER_BLOCK_CLI, GLUSTER_BLOCK_CLI_VERS,
-                          &sockfd, 0, 0);
+  clnt = clntunix_create((struct sockaddr_un *) &saun,
+                         GLUSTER_BLOCK_CLI, GLUSTER_BLOCK_CLI_VERS,
+                         &sockfd, 0, 0);
   if (!clnt) {
     LOG("cli", GB_LOG_ERROR, "%s, unix addr %s",
         clnt_spcreateerror("client create failed"), GB_UNIX_ADDRESS);
@@ -214,7 +214,7 @@ glusterBlockCreate(int argcount, char **options)
       break;
 
     case GB_CLI_CREATE_SIZE:
-      cobj.size = glusterBlockCreateParseSize(options[optind++]);
+      cobj.size = glusterBlockCreateParseSize("cli", options[optind++]);
       if (cobj.size < 0) {
         LOG("cli", GB_LOG_ERROR, "%s", "failed while parsing size");
         ret = -1;
@@ -235,6 +235,7 @@ glusterBlockCreate(int argcount, char **options)
     default:
       MSG("unrecognized option '%s'\n", options[optind-1]);
       MSG("%s", "Hint: gluster-block help\n");
+      ret = -1;
       goto out;
     }
   }
@@ -289,7 +290,6 @@ glusterBlockList(int argcount, char **options)
   }
 
   strcpy(cobj.volume, options[optind]);
-
   ret = glusterBlockCliRPC_1(&cobj, LIST_CLI, &out);
 
   if(out) {
diff --git a/configure.ac b/configure.ac
index 9644f7f..90ffafb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ AC_TYPE_SSIZE_T
 
 # Checks for library functions.
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([bzero gethostbyname memset socket strchr strdup strerror])
+AC_CHECK_FUNCS([gethostbyname memset socket strchr strdup strerror])
 AC_OUTPUT
 
 cat <h_addr, (char *)&sain.sin_addr.s_addr,
         server->h_length);
@@ -182,7 +181,7 @@ blockServerParse(char *blkServers)
   base = tmp;
 
   if (GB_ALLOC(list) < 0) {
-    goto fail;
+    goto out;
   }
 
   /* count number of servers */
@@ -197,18 +196,18 @@ blockServerParse(char *blkServers)
 
 
   if (GB_ALLOC_N(list->hosts, list->nhosts) < 0) {
-    goto fail;
+    goto out;
   }
 
   for (i = 0; tmp != NULL; i++) {
     if (GB_STRDUP(list->hosts[i], strsep(&tmp, GB_MSERVER_DELIMITER)) < 0) {
-      goto fail;
+      goto out;
     }
   }
 
   return list;
 
- fail:
+ out:
   GB_FREE(base);
   blockServerDefFree(list);
   return NULL;
@@ -238,11 +237,16 @@ glusterBlockCreateRemote(void *data)
                         ret, out, "%s: CONFIGSUCCESS\n", args->addr);
 
  out:
+  if(!args->reply) {
+    if (asprintf(&args->reply, "failed to config on %s", args->addr) == -1) {
+      ret = -1;
+    }
+  }
   pthread_exit(&ret);   /* collect ret in pthread_join 2nd arg */
 }
 
 
-void
+static int
 glusterBlockCreateRemoteAsync(blockServerDefPtr list,
                             size_t listindex, size_t mpath,
                             struct glfs *glfs,
@@ -252,19 +256,24 @@ glusterBlockCreateRemoteAsync(blockServerDefPtr list,
   pthread_t  *tid = NULL;
   static blockRemoteObj **args = NULL;
   char *tmp = *savereply;
+  int *status[mpath];
+  int ret = -1;
   size_t i;
 
 
   if (GB_ALLOC_N(tid, mpath) < 0) {
+    mpath = 0;
     goto out;
   }
 
   if (GB_ALLOC_N(args, mpath) < 0) {
+    mpath = 0;
     goto out;
-  }
+ }
 
   for (i = 0; i < mpath; i++) {
     if (GB_ALLOC(args[i])< 0) {
+      mpath = i;
       goto out;
     }
   }
@@ -280,11 +289,13 @@ glusterBlockCreateRemoteAsync(blockServerDefPtr list,
   }
 
   for (i = 0; i < mpath; i++) {
-    pthread_join(tid[i], NULL);
+    /* collect exit code */
+    pthread_join(tid[i], (void**)&(status[i]));
   }
 
   for (i = 0; i < mpath; i++) {
     if (asprintf(savereply, "%s%s\n", (tmp==NULL?"":tmp), args[i]->reply) == -1) {
+      /* TODO: Fail with vaild info, depends on mpath */
       *savereply = tmp;
       goto out;
     } else {
@@ -293,10 +304,18 @@ glusterBlockCreateRemoteAsync(blockServerDefPtr list,
     }
   }
 
+  ret = 0;
+  for (i = 0; i < mpath; i++) {
+    if (*status[i]) {
+      ret = -1;
+      goto out;
+    }
+  }
+
  out:
   blockRemoteObjFree(tid, args, mpath);
 
-  return;
+  return ret;
 }
 
 
@@ -322,48 +341,44 @@ glusterBlockDeleteRemote(void *data)
                         ret, out, "%s: CLEANUPSUCCESS\n", args->addr);
 
  out:
+  if(!args->reply) {
+    if (asprintf(&args->reply, "failed to delete config on %s", args->addr) == -1) {
+      ret = -1;
+    }
+  }
   pthread_exit(&ret);   /* collect ret in pthread_join 2nd arg */
 }
 
 
-void
+static int
 glusterBlockDeleteRemoteAsync(MetaInfo *info,
                               struct glfs *glfs,
                               blockDelete *dobj,
+                              size_t count,
                               bool deleteall,
                               char **savereply)
 {
   pthread_t  *tid = NULL;
   static blockRemoteObj **args = NULL;
   char *tmp = *savereply;
+  int *status[count];
+  int ret = -1;
   size_t i;
-  size_t count = 0;
 
-  for (i = 0; i < info->nhosts; i++) {
-    switch (blockMetaStatusEnumParse(info->list[i]->status)) {
-    case GB_CLEANUP_INPROGRES:
-    case GB_CLEANUP_FAIL:
-    case GB_CONFIG_FAIL:
-    case GB_CONFIG_INPROGRESS:
-      count++;
-      break;
-    }
-    if (deleteall &&
-        blockMetaStatusEnumParse(info->list[i]->status) == GB_CONFIG_SUCCESS) {
-      count++;
-    }
-  }
 
   if (GB_ALLOC_N(tid, count) < 0) {
+    count = 0;
     goto out;
   }
 
   if (GB_ALLOC_N(args, count) < 0) {
+    count = 0;
     goto out;
   }
 
   for (i = 0; i < count; i++) {
     if (GB_ALLOC(args[i])< 0) {
+      count = i;
       goto out;
     }
   }
@@ -396,11 +411,12 @@ glusterBlockDeleteRemoteAsync(MetaInfo *info,
   }
 
   for (i = 0; i < count; i++) {
-    pthread_join(tid[i], NULL);
+    pthread_join(tid[i], (void**)&(status[i]));
   }
 
   for (i = 0; i < count; i++) {
     if (asprintf(savereply, "%s%s\n", (tmp==NULL?"":tmp), args[i]->reply) == -1) {
+      /* TODO: Fail with vaild info */
       *savereply = tmp;
       goto out;
     } else {
@@ -409,10 +425,18 @@ glusterBlockDeleteRemoteAsync(MetaInfo *info,
     }
   }
 
+  ret = 0;
+  for (i = 0; i < count; i++) {
+    if (*status[i]) {
+      ret = -1;
+      goto out;
+    }
+  }
+
  out:
   blockRemoteObjFree(tid, args, count);
 
-  return;
+  return ret;
 }
 
 
@@ -424,6 +448,7 @@ glusterBlockCleanUp(struct glfs *glfs, char *blockname,
   size_t i;
   static blockDelete dobj;
   size_t cleanupsuccess = 0;
+  size_t count = 0;
   MetaInfo *info;
 
 
@@ -439,33 +464,68 @@ glusterBlockCleanUp(struct glfs *glfs, char *blockname,
   strcpy(dobj.block_name, blockname);
   strcpy(dobj.gbid, info->gbid);
 
-  glusterBlockDeleteRemoteAsync(info, glfs, &dobj, deleteall, reply);
-
-  blockFreeMetaInfo(info);
-
-  if (GB_ALLOC(info) < 0)
-    goto out;
-
-  ret = blockGetMetaInfo(glfs, blockname, info);
-  if (ret)
-    goto out;
-
   for (i = 0; i < info->nhosts; i++) {
-    if (blockMetaStatusEnumParse(info->list[i]->status) == GB_CLEANUP_SUCCESS) {
-      cleanupsuccess++;
+    switch (blockMetaStatusEnumParse(info->list[i]->status)) {
+    case GB_CLEANUP_INPROGRES:
+    case GB_CLEANUP_FAIL:
+    case GB_CONFIG_FAIL:
+    case GB_CONFIG_INPROGRESS:
+      count++;
+      break;
+    }
+    if (deleteall &&
+        blockMetaStatusEnumParse(info->list[i]->status) == GB_CONFIG_SUCCESS) {
+      count++;
     }
   }
 
-  if (cleanupsuccess == info->nhosts) {
-    if (glusterBlockDeleteEntry(glfs, info->volume, info->gbid)) {
-      LOG("mgmt", GB_LOG_ERROR, "%s volume: %s host: %s",
-          FAILED_DELETING_FILE, info->volume, "localhost");
+  ret = glusterBlockDeleteRemoteAsync(info, glfs, &dobj, count, deleteall, reply);
+  if (ret) {
+    LOG("mgmt", GB_LOG_WARNING, "glusterBlockDeleteRemoteAsync: return %d"
+        " %s volume: %s blockname %s", ret, FAILED_DELETING_FILE,
+        info->volume, blockname);
+    /* No action ? */
+  }
+
+  /* delete metafile and block file */
+  if (deleteall) {
+    blockFreeMetaInfo(info);
+
+    if (GB_ALLOC(info) < 0) {
+      ret = -1;
+      goto out;
     }
-    ret = glusterBlockDeleteMetaFile(glfs, info->volume, blockname);
+
+    ret = blockGetMetaInfo(glfs, blockname, info);
     if (ret) {
-      LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockDeleteMetaFile: failed");
       goto out;
     }
+
+    for (i = 0; i < info->nhosts; i++) {
+      if (blockMetaStatusEnumParse(info->list[i]->status) == GB_CLEANUP_SUCCESS) {
+        cleanupsuccess++;
+      }
+    }
+
+    if (cleanupsuccess == info->nhosts) {
+      GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume,
+          ret, out, "ENTRYDELETE: INPROGRESS\n");
+      if (glusterBlockDeleteEntry(glfs, info->volume, info->gbid)) {
+        GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume,
+            ret, out, "ENTRYDELETE: FAIL\n");
+        LOG("mgmt", GB_LOG_ERROR, "%s volume: %s host: %s",
+            FAILED_DELETING_FILE, info->volume, "localhost");
+        ret = -1;
+        goto out;
+      }
+      GB_METAUPDATE_OR_GOTO(lock, glfs, info->gbid, info->volume,
+          ret, out, "ENTRYDELETE: SUCCESS\n");
+      ret = glusterBlockDeleteMetaFile(glfs, info->volume, blockname);
+      if (ret) {
+        LOG("mgmt", GB_LOG_ERROR, "%s", "glusterBlockDeleteMetaFile: failed");
+        goto out;
+      }
+    }
   }
 
  out:
@@ -515,6 +575,8 @@ glusterBlockAuditRequest(struct glfs *glfs,
 
   /* check if mpath is satisfied */
   if (blk->mpath == successcnt) {
+    LOG("mgmt", GB_LOG_INFO, "Block create request satisfied for block:"
+        " %s volume: %s", blk->block_name, blk->volume);
     ret = 0;
     goto out;
   } else {
@@ -525,32 +587,43 @@ glusterBlockAuditRequest(struct glfs *glfs,
       LOG("mgmt", GB_LOG_WARNING,
           "No Spare nodes to create (%s): rewinding creation of target",
           blk->block_name);
-      ret = -1;
       glusterBlockCleanUp(glfs,
                           blk->block_name, TRUE, reply);
       needcleanup = FALSE;   /* already clean attempted */
+      ret = -1;
       goto out;
     } else if (spare < morereq) {
       LOG("mgmt", GB_LOG_WARNING,
           "Not enough Spare nodes for (%s): rewinding creation of target",
           blk->block_name);
-      ret = -1;
       glusterBlockCleanUp(glfs,
                           blk->block_name, TRUE, reply);
       needcleanup = FALSE;   /* already clean attempted */
+      ret = -1;
       goto out;
     } else {
       /* create on spare */
       LOG("mgmt", GB_LOG_INFO,
           "Trying to serve request for (%s) from spare machines",
           blk->block_name);
-      glusterBlockCreateRemoteAsync(list, spent, morereq,
-                                    glfs, cobj, reply);
+      ret = glusterBlockCreateRemoteAsync(list, spent, morereq,
+                                          glfs, cobj, reply);
+      if (ret) {
+        LOG("mgmt", GB_LOG_WARNING, "glusterBlockCreateRemoteAsync: return %d"
+            " %s volume: %s hosts: %s blockname %s", ret, FAILED_CREATING_FILE,
+            blk->volume, blk->block_hosts, blk->block_name);
+      }
+      /* we could ideally moved this into #CreateRemoteAsync fail {} */
       needcleanup = TRUE;
     }
   }
 
   ret = glusterBlockAuditRequest(glfs, blk, cobj, list, reply);
+  if (ret) {
+    LOG("mgmt", GB_LOG_ERROR, "glusterBlockAuditRequest: return %d"
+        " %s volume: %s hosts: %s blockname %s", ret, FAILED_CREATING_FILE,
+        blk->volume, blk->block_hosts, blk->block_name);
+  }
 
  out:
   if (needcleanup) {
@@ -647,11 +720,21 @@ block_create_cli_1_svc(blockCreateCli *blk, struct svc_req *rqstp)
   cobj.size = blk->size;
   strcpy(cobj.gbid, gbid);
 
-  glusterBlockCreateRemoteAsync(list, 0, blk->mpath,
-                                glfs, &cobj, &savereply);
+  ret = glusterBlockCreateRemoteAsync(list, 0, blk->mpath,
+                                      glfs, &cobj, &savereply);
+  if (ret) {
+    LOG("mgmt", GB_LOG_WARNING, "glusterBlockCreateRemoteAsync: return %d"
+        " %s volume: %s hosts: %s blockname %s", ret, FAILED_CREATING_FILE,
+        blk->volume, blk->block_hosts, blk->block_name);
+  }
 
   /* Check Point */
   ret = glusterBlockAuditRequest(glfs, blk, &cobj, list, &savereply);
+  if (ret) {
+    LOG("mgmt", GB_LOG_ERROR, "glusterBlockAuditRequest: return %d"
+        " %s volume: %s hosts: %s blockname %s", ret, FAILED_CREATING_FILE,
+        blk->volume, blk->block_hosts, blk->block_name);
+  }
 
  out:
   reply->out = savereply;
@@ -692,23 +775,21 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp)
   if (GB_ALLOC(reply) < 0) {
     goto out;
   }
+  reply->exit = -1;
 
   if (gethostname(hostname, HOST_NAME_MAX)) {
     LOG("mgmt", GB_LOG_ERROR, "gethostname failed (%s)", strerror(errno));
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&backstore, "%s %s %s %zu %s@%s%s/%s %s", GB_TGCLI_GLFS,
                GB_CREATE, blk->block_name, blk->size, blk->volume,
                hostname, GB_STOREDIR, blk->gbid, blk->gbid) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&iqn, "%s %s %s%s", GB_TGCLI_ISCSI, GB_CREATE,
                GB_TGCLI_IQN_PREFIX, blk->gbid) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
@@ -716,21 +797,18 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp)
   if (asprintf(&lun, "%s/%s%s/tpg1/luns %s %s/%s",  GB_TGCLI_ISCSI,
                GB_TGCLI_IQN_PREFIX, blk->gbid, GB_CREATE,
                GB_TGCLI_GLFS_PATH, blk->block_name) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&portal, "%s/%s%s/tpg1/portals create %s",
                GB_TGCLI_ISCSI, GB_TGCLI_IQN_PREFIX, blk->gbid,
                hostname) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&attr, "%s/%s%s/tpg1 set attribute %s",
                GB_TGCLI_ISCSI, GB_TGCLI_IQN_PREFIX, blk->gbid,
                GB_TGCLI_ATTRIBUTES) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
@@ -738,7 +816,6 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp)
   if (asprintf(&exec, "%s && %s && %s && %s && %s && %s && %s",
                GB_TGCLI_GLOBALS, backstore, iqn, lun, portal, attr,
                GB_TGCLI_SAVE) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
@@ -748,19 +825,18 @@ block_create_1_svc(blockCreate *blk, struct svc_req *rqstp)
   }
 
   fp = popen(exec, "r");
-  if (fp != NULL) {
+  if (fp) {
     size_t newLen = fread(reply->out, sizeof(char), 4096, fp);
     if (ferror( fp ) != 0) {
-      LOG("mgmt", GB_LOG_ERROR, "Reading command %s output", exec);
+      LOG("mgmt", GB_LOG_ERROR, "reading command %s output", exec);
     } else {
       reply->out[newLen++] = '\0';
     }
     reply->exit = WEXITSTATUS(pclose(fp));
   } else {
       LOG("mgmt", GB_LOG_ERROR,
-          "popen(): on host %s executing command (%s) failed(%s)",
-          hostname, exec, strerror(errno));
-    reply->exit = errno;
+          "popen(): for block %s executing command (%s) failed(%s)",
+          blk->block_name, exec, strerror(errno));
   }
 
  out:
@@ -811,6 +887,11 @@ block_delete_cli_1_svc(blockDeleteCli *blk, struct svc_req *rqstp)
   }
 
   ret = glusterBlockCleanUp(glfs, blk->block_name, TRUE, &savereply);
+  if (ret) {
+    LOG("mgmt", GB_LOG_WARNING, "glusterBlockCleanUp: return %d"
+        " %s volume: %s blockname %s", ret, FAILED_DELETING_FILE,
+        blk->volume, blk->block_name);
+  }
 
  out:
   reply->out = savereply;
@@ -819,9 +900,10 @@ block_delete_cli_1_svc(blockDeleteCli *blk, struct svc_req *rqstp)
 
   reply->exit = ret;
 
-  if (lkfd && glfs_close(lkfd) != 0)
+  if (lkfd && glfs_close(lkfd) != 0) {
     LOG("mgmt", GB_LOG_ERROR, "glfs_close(%s): on volume %s failed[%s]",
         GB_TXLOCKFILE, blk->volume, strerror(errno));
+  }
 
   glfs_fini(glfs);
 
@@ -842,22 +924,20 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp)
   if (GB_ALLOC(reply) < 0) {
     goto out;
   }
+  reply->exit = -1;
 
   if (asprintf(&iqn, "%s %s %s%s", GB_TGCLI_ISCSI, GB_DELETE,
                GB_TGCLI_IQN_PREFIX, blk->gbid) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&backstore, "%s %s %s", GB_TGCLI_GLFS,
                GB_DELETE, blk->block_name) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
   if (asprintf(&exec, "%s && %s && %s", backstore, iqn,
                GB_TGCLI_SAVE) == -1) {
-    reply->exit = -1;
     goto out;
   }
 
@@ -867,7 +947,7 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp)
   }
 
   fp = popen(exec, "r");
-  if (fp != NULL) {
+  if (fp) {
     size_t newLen = fread(reply->out, sizeof(char), 4096, fp);
     if (ferror( fp ) != 0) {
       LOG("mgmt", GB_LOG_ERROR, "reading command %s output", exec);
@@ -875,6 +955,10 @@ block_delete_1_svc(blockDelete *blk, struct svc_req *rqstp)
       reply->out[newLen++] = '\0';
     }
     reply->exit = WEXITSTATUS(pclose(fp));
+  } else {
+      LOG("mgmt", GB_LOG_ERROR,
+          "popen(): for block %s executing command (%s) failed(%s)",
+          blk->block_name, exec, strerror(errno));
   }
 
  out:
diff --git a/rpc/glfs-operations.c b/rpc/glfs-operations.c
index 26d89e3..4b84528 100644
--- a/rpc/glfs-operations.c
+++ b/rpc/glfs-operations.c
@@ -87,18 +87,34 @@ glusterBlockCreateEntry(struct glfs *glfs,
   if (!tgfd) {
     LOG("gfapi", GB_LOG_ERROR, "glfs_creat(%s) on volume %s failed[%s]",
         gbid, blk->volume, strerror(errno));
+    ret = -1;
+    goto out;
   } else {
     ret = glfs_ftruncate(tgfd, blk->size);
     if (ret) {
       LOG("gfapi", GB_LOG_ERROR, "glfs_ftruncate(%s): on volume %s "
           "of size %zu failed[%s]", gbid, blk->volume, blk->size,
           strerror(errno));
+
+      if (tgfd && glfs_close(tgfd) != 0) {
+        LOG("gfapi", GB_LOG_ERROR, "glfs_close(%s): on volume %s failed[%s]",
+            gbid, blk->volume, strerror(errno));
+      }
+
+      ret = glfs_unlink(glfs, gbid);
+      if (ret && errno != ENOENT) {
+        LOG("gfapi", GB_LOG_ERROR, "glfs_unlink(%s) on volume %s failed[%s]",
+            gbid, blk->volume, strerror(errno));
+      }
+
+      ret = -1;
       goto out;
     }
 
     if (tgfd && glfs_close(tgfd) != 0) {
       LOG("gfapi", GB_LOG_ERROR, "glfs_close(%s): on volume %s failed[%s]",
           gbid, blk->volume, strerror(errno));
+      ret = -1;
       goto out;
     }
   }
@@ -201,8 +217,9 @@ blockFreeMetaInfo(MetaInfo *info)
   if (!info)
     return;
 
-  for (i = 0; i < info->nhosts; i++)
+  for (i = 0; i < info->nhosts; i++) {
     GB_FREE(info->list[i]);
+  }
 
   GB_FREE(info->list);
   GB_FREE(info);
@@ -282,7 +299,7 @@ blockGetMetaInfo(struct glfs* glfs, char* metafile, MetaInfo *info)
   struct glfs_fd *tgmfd = NULL;
   char line[1024];
   char *tmp;
-  int ret = 0;
+  int ret;
 
 
   ret = glfs_chdir (glfs, GB_METADIR);
diff --git a/utils/common.c b/utils/common.c
index dfa6bc8..a605f0d 100644
--- a/utils/common.c
+++ b/utils/common.c
@@ -14,7 +14,7 @@
 
 
 ssize_t
-glusterBlockCreateParseSize(char *value)
+glusterBlockCreateParseSize(const char *dom, char *value)
 {
   char *postfix;
   char *tmp;
@@ -26,7 +26,7 @@ glusterBlockCreateParseSize(char *value)
 
   sizef = strtod(value, &postfix);
   if (sizef < 0) {
-    ERROR("%s", "size cannot be negative number\n");
+    LOG(dom, GB_LOG_ERROR, "%s", "size cannot be negative number");
     return -1;
   }
 
@@ -66,9 +66,9 @@ glusterBlockCreateParseSize(char *value)
     return sizef;
     break;
   default:
-  /*TODO: Log this instead of printing
-     ERROR("%s", "You may use k/K, M, G or T suffixes for "
-           "kilobytes, megabytes, gigabytes and terabytes."); */
+    LOG(dom, GB_LOG_ERROR, "%s",
+         "You may use k/K, M, G or T suffixes for kilobytes, "
+         "megabytes, gigabytes and terabytes.");
     return -1;
   }
 }
diff --git a/utils/common.h b/utils/common.h
index 7cac49a..6bb3273 100644
--- a/utils/common.h
+++ b/utils/common.h
@@ -33,6 +33,6 @@
 
 # define  SUN_PATH_MAX     (sizeof(struct sockaddr_un) - sizeof(unsigned short int)) /*sun_family*/
 
-ssize_t glusterBlockCreateParseSize(char *value);
+ssize_t glusterBlockCreateParseSize(const char *dom, char *value);
 
 # endif /* _COMMON_H */
diff --git a/utils/utils.h b/utils/utils.h
index fc9e1ef..6bae689 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -290,6 +290,7 @@ typedef enum Metakey {
   GB_META_SIZE        = 2,
   GB_META_HA          = 3,
   GB_META_ENTRYCREATE = 4,
+  GB_META_ENTRYDELETE = 5,
 
   GB_METAKEY_MAX
 } Metakey;
@@ -300,6 +301,7 @@ static const char *const MetakeyLookup[] = {
   [GB_META_SIZE]        = "SIZE",
   [GB_META_HA]          = "HA",
   [GB_META_ENTRYCREATE] = "ENTRYCREATE",
+  [GB_META_ENTRYDELETE] = "ENTRYDELETE",
 
   [GB_METAKEY_MAX]      = NULL
 };
-- 
cgit