use non blob store leadership

Author: root

lib/blob/blobstore.c

@@ -511,6 +511,7 @@ blob_execute_queued_io(struct spdk_io_channel_iter *i)
 			if (!ctx->blob->failed_on_update && bs->is_leader) {
 				bs_user_op_execute(op);
 			} else {
+				SPDK_NOTICELOG("The IO return with EIO error due to leader or failed update.\n");
 				bs_user_op_abort(op, -EIO);
 			}		
 		}
@@ -2230,7 +2231,7 @@ blob_persist_clear_clusters_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserr
 	struct spdk_blob_store		*bs = blob->bs;
 	size_t				i;
 
-	if (bserrno != 0) {
+	if (bserrno != 0) {		
 		blob_persist_complete(seq, ctx, bserrno);
 		return;
 	}

lib/blob/request.c

@@ -325,7 +325,7 @@ bs_batch_completion(struct spdk_io_channel *_channel,
 	struct spdk_bs_channel		*channel = set->channel;
 	struct limit *ctx;
 	set->u.batch.outstanding_ops--;
-	if (bserrno != 0) {
+	if (bserrno != 0) {		
 		set->bserrno = bserrno;
 	}
 
@@ -339,7 +339,8 @@ bs_batch_completion(struct spdk_io_channel *_channel,
 				channel->dev->unmap(channel->dev, channel->dev_channel, ctx->lba, ctx->lba_count,
 						&set->cb_args);
 			} else {
-				bs_batch_completion(_channel, set->cb_args.cb_arg, 0);
+				SPDK_NOTICELOG("The unmap IO return with EIO error due to leader.\n");
+				bs_batch_completion(_channel, set->cb_args.cb_arg, -EIO);
 			}
 			free(ctx);
 		}
@@ -469,7 +470,8 @@ bs_batch_unmap_dev(spdk_bs_batch_t *batch,
 		channel->dev->unmap(channel->dev, channel->dev_channel, lba, lba_count,
 					&set->cb_args);
 	} else {
-		bs_batch_completion(set->cb_args.channel, set->cb_args.cb_arg, 0);
+		SPDK_NOTICELOG("The unmap IO return with EIO error due to leader 1.\n");
+		bs_batch_completion(set->cb_args.channel, set->cb_args.cb_arg, -EIO);
 	}
 }
 
@@ -488,7 +490,8 @@ bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch,
 		channel->dev->write_zeroes(channel->dev, channel->dev_channel, lba, lba_count,
 				   	&set->cb_args);
 	} else {
-		bs_batch_completion(set->cb_args.channel, set->cb_args.cb_arg, 0);
+		SPDK_NOTICELOG("The write zero IO return with EIO error due to leader.\n");
+		bs_batch_completion(set->cb_args.channel, set->cb_args.cb_arg, -EIO);
 	}
 }
 

lib/lvol/lvol.c

@@ -2846,25 +2846,25 @@ spdk_lvol_set_leader_failed_on_update(struct spdk_lvol *lvol)
 }
 
 void
-spdk_set_leader_all(struct spdk_lvol_store *t_lvs, bool lvs_leader, bool bs_leadership)
+spdk_set_leader_all(struct spdk_lvol_store *t_lvs, bool lvs_leader, bool bs_nonleadership)
 {
 	struct spdk_lvol_store *lvs;
 	struct spdk_lvol *lvol;	
-	SPDK_NOTICELOG("Lvs_leader state changed via RPC to %s and bs_leader to %s.\n", 
+	SPDK_NOTICELOG("Lvs_leader state changed via RPC to %s and bs_nonleader to %s.\n", 
                 lvs_leader ? "true" : "false",
-                bs_leadership ? "true" : "false");
+                bs_nonleadership ? "true" : "false");
 
 	pthread_mutex_lock(&g_lvol_stores_mutex);
 
 	TAILQ_FOREACH(lvs, &g_lvol_stores, link) {
 		if (t_lvs == lvs) {			
 			lvs->update_in_progress = false;
 
-			spdk_bs_set_leader(lvs->blobstore, bs_leadership);
+			spdk_bs_set_leader(lvs->blobstore, !bs_nonleadership);
 
-			TAILQ_FOREACH(lvol, &lvs->lvols, link) {			
+			TAILQ_FOREACH(lvol, &lvs->lvols, link) {
 				lvol->leader = lvs_leader;
-				lvol->update_in_progress = false;			
+				lvol->update_in_progress = false;
 			}
 			lvs->leader = lvs_leader;
 		}

module/bdev/lvol/vbdev_lvol_rpc.c

@@ -2114,14 +2114,14 @@ struct rpc_bdev_lvol_leadership {
 	char *uuid;
 	char *lvs_name;
 	bool lvs_leadership;
-	bool bs_leadership;
+	bool bs_nonleadership;
 };
 
 static const struct spdk_json_object_decoder rpc_bdev_lvol_leadership_decoders[] = {
 	{"uuid", offsetof(struct rpc_bdev_lvol_grow_lvstore, uuid), spdk_json_decode_string, true},
 	{"lvs_name", offsetof(struct rpc_bdev_lvol_grow_lvstore, lvs_name), spdk_json_decode_string, true},
 	{"lvs_leadership", offsetof(struct rpc_bdev_lvol_leadership, lvs_leadership), spdk_json_decode_bool},
-	{"bs_leadership", offsetof(struct rpc_bdev_lvol_leadership, bs_leadership), spdk_json_decode_bool},
+	{"bs_nonleadership", offsetof(struct rpc_bdev_lvol_leadership, bs_nonleadership), spdk_json_decode_bool},
 };
 
 static void
@@ -2147,7 +2147,7 @@ rpc_bdev_lvol_set_leader_all(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	spdk_set_leader_all(lvs, req.lvs_leadership, req.bs_leadership);
+	spdk_set_leader_all(lvs, req.lvs_leadership, req.bs_nonleadership);
 	spdk_jsonrpc_send_bool_response(request, true);
 cleanup:
 	free(req.uuid);

python/spdk/rpc/lvol.py

@@ -74,19 +74,16 @@ def bdev_lvol_update_lvstore(client, uuid=None, lvs_name=None):
         params['lvs_name'] = lvs_name
     return client.call('bdev_lvol_update_lvstore', params)
 
-def bdev_lvol_set_leader_all(client, uuid=None, lvs_name=None, lvs_leadership=False, bs_leadership=False):
+def bdev_lvol_set_leader_all(client, uuid=None, lvs_name=None, lvs_leadership=False, bs_nonleadership=False):
     """Change state of the leadership
 
     Args:
         uuid: UUID of the lvolstore
         lvs_name: lvolstore name
         lvs_leadership: Leadership state for lvolstore (default: False)
-        bs_leadership: Leadership state for blobstore (default: True)
+        bs_leadership: Leadership state for blobstore (default: False)
     """ 
-    params = {'lvs_leadership': lvs_leadership, 'bs_leadership': bs_leadership}
-    
-    if bs_leadership is None:
-        params['bs_leadership'] = True
+    params = {'lvs_leadership': lvs_leadership, 'bs_nonleadership': bs_nonleadership}
 
     if (uuid and lvs_name):
         raise ValueError("Exactly one of uuid or lvs_name may be specified")

scripts/rpc.py

@@ -2045,12 +2045,12 @@ def bdev_lvol_set_leader_all(args):
                                                    uuid=args.uuid,
                                                    lvs_name=args.lvs_name,
                                                    lvs_leadership=args.lvs_leadership,
-                                                   bs_leadership=args.bs_leadership))
+                                                   bs_nonleadership=args.bs_nonleadership))
 
     p = subparsers.add_parser('bdev_lvol_set_leader_all',
                               help='Change leadership state for lvstore and lvols')
-    p.add_argument('-l', '--lvs-leadership', action='store_true', help='Leadership state for lvolstore level')
-    p.add_argument('-b', '--bs-leadership', action='store_true', help='Leadership state for blobstore level, default True')
+    p.add_argument('-l', '--lvs-leadership', action='store_true', help='Leadership state for lvolstore level, default False')
+    p.add_argument('-b', '--bs-nonleadership', action='store_true', help='Leadership state for blobstore level, default False')
     p.add_argument('-u', '--uuid', help='lvol store UUID')
     p.add_argument('-s', '--lvs-name', help='lvol store name')
     p.set_defaults(func=bdev_lvol_set_leader_all)