2 files changed, 7 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index 2c3f71bb245..8fcc93c788f 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -3486,6 +3486,13 @@ rpc_receive_common (rpcsvc_request_t *req, call_frame_t **fr,
                 SERVER_REQ_SET_ERROR (req, ret);
                 goto out;
         }
+
+        if (!(*fr)->root->client->bound_xl->itable) {
+                /* inode_table is not allocated successful in server_setvolume */
+                SERVER_REQ_SET_ERROR (req, ret);
+                goto out;
+        }
+
         ret = 0;
 
 out:
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 30546e87b8d..758264a638b 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1507,7 +1507,6 @@ server_notify (xlator_t *this, int32_t event, void *data, ...)
                                                      victim->name);
                         /* we need the protocol/server xlator here as 'this' */
                         glusterfs_autoscale_threads (ctx, -1, this);
-                        default_notify (victim, GF_EVENT_CLEANUP, data);
                 }
                 break;