1 files changed, 12 insertions, 8 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c
index a202481d99a..34abf35cb00 100644
--- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c
@@ -43,6 +43,7 @@ __glusterd_handle_log_rotate(rpcsvc_request_t *req)
     if (ret < 0) {
         // failed to decode msg;
         req->rpc_err = GARBAGE_ARGS;
+        gf_smsg(this->name, GF_LOG_ERROR, errno, GD_MSG_GARBAGE_ARGS, NULL);
         goto out;
     }
 
@@ -75,7 +76,7 @@ __glusterd_handle_log_rotate(rpcsvc_request_t *req)
            "for volume %s",
            volname);
 
-    ret = dict_set_uint64(dict, "rotate-key", (uint64_t)time(NULL));
+    ret = dict_set_uint64(dict, "rotate-key", (uint64_t)gf_time());
     if (ret)
         goto out;
 
@@ -105,7 +106,6 @@ glusterd_op_stage_log_rotate(dict_t *dict, char **op_errstr)
     int ret = -1;
     char *volname = NULL;
     glusterd_volinfo_t *volinfo = NULL;
-    gf_boolean_t exists = _gf_false;
     char msg[2048] = {0};
     char *brick = NULL;
 
@@ -116,13 +116,11 @@ glusterd_op_stage_log_rotate(dict_t *dict, char **op_errstr)
         goto out;
     }
 
-    exists = glusterd_check_volume_exists(volname);
     ret = glusterd_volinfo_find(volname, &volinfo);
-    if (!exists) {
+    if (ret) {
         snprintf(msg, sizeof(msg), "Volume %s does not exist", volname);
         gf_msg("glusterd", GF_LOG_ERROR, 0, GD_MSG_VOL_NOT_FOUND, "%s", msg);
         *op_errstr = gf_strdup(msg);
-        ret = -1;
         goto out;
     }
 
@@ -141,6 +139,8 @@ glusterd_op_stage_log_rotate(dict_t *dict, char **op_errstr)
     /* If no brick is specified, do log-rotate for
        all the bricks in the volume */
     if (ret) {
+        gf_smsg("glusterd", GF_LOG_ERROR, errno, GD_MSG_DICT_GET_FAILED,
+                "Key=brick", NULL);
         ret = 0;
         goto out;
     }
@@ -207,8 +207,11 @@ glusterd_op_log_rotate(dict_t *dict)
     ret = dict_get_str(dict, "brick", &brick);
     /* If no brick is specified, do log-rotate for
        all the bricks in the volume */
-    if (ret)
+    if (ret) {
+        gf_smsg("glusterd", GF_LOG_ERROR, errno, GD_MSG_DICT_GET_FAILED,
+                "Key=brick", NULL);
         goto cont;
+    }
 
     ret = glusterd_brickinfo_new_from_brick(brick, &tmpbrkinfo, _gf_false,
                                             NULL);
@@ -229,8 +232,9 @@ cont:
         if (gf_uuid_compare(brickinfo->uuid, MY_UUID))
             continue;
 
-        if (brick && (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) ||
-                      strcmp(tmpbrkinfo->path, brickinfo->path)))
+        if (tmpbrkinfo && brick &&
+            (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) ||
+             strcmp(tmpbrkinfo->path, brickinfo->path)))
             continue;
 
         valid_brick = 1;