Merge pull request #13795 from LabNConsulting/chopps/mgmt-lock-cleanup

mgmt lock simplification

Author: Jafaral

lib/command.c

@@ -1333,11 +1333,12 @@ int config_from_file(struct vty *vty, FILE *fp, unsigned int *line_num)
 /* Configuration from terminal */
 DEFUN (config_terminal,
        config_terminal_cmd,
-       "configure [terminal]",
+       "configure [terminal [file-lock]]",
        "Configuration from vty interface\n"
+       "Configuration with locked datastores\n"
        "Configuration terminal\n")
 {
-	return vty_config_enter(vty, false, false);
+	return vty_config_enter(vty, false, false, argc == 3);
 }
 
 /* Enable command */

lib/mgmt.proto

@@ -243,7 +243,8 @@ message FeSetConfigReply {
   required DatastoreId ds_id = 2;
   required uint64 req_id = 3;
   required bool success = 4;
-  optional string error_if_any = 5;
+  required bool implicit_commit = 5;
+  optional string error_if_any = 6;
 }
 
 message FeCommitConfigReq {

lib/mgmt_fe_client.c

@@ -164,7 +164,7 @@ static int mgmt_fe_send_session_req(struct mgmt_fe_client *client,
 
 int mgmt_fe_send_lockds_req(struct mgmt_fe_client *client, uint64_t session_id,
 			    uint64_t req_id, Mgmtd__DatastoreId ds_id,
-			    bool lock)
+			    bool lock, bool scok)
 {
 	(void)req_id;
 	Mgmtd__FeMessage fe_msg;
@@ -185,7 +185,7 @@ int mgmt_fe_send_lockds_req(struct mgmt_fe_client *client, uint64_t session_id,
 		lock ? "" : "UN", dsid2name(ds_id), session_id);
 
 
-	return mgmt_fe_client_send_msg(client, &fe_msg, false);
+	return mgmt_fe_client_send_msg(client, &fe_msg, scok);
 }
 
 int mgmt_fe_send_setcfg_req(struct mgmt_fe_client *client, uint64_t session_id,
@@ -411,6 +411,7 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				session->user_ctx, fe_msg->setcfg_reply->req_id,
 				fe_msg->setcfg_reply->success,
 				fe_msg->setcfg_reply->ds_id,
+				fe_msg->setcfg_reply->implicit_commit,
 				fe_msg->setcfg_reply->error_if_any);
 		break;
 	case MGMTD__FE_MESSAGE__MESSAGE_COMMCFG_REPLY:

lib/mgmt_fe_client.h

@@ -91,7 +91,7 @@ struct mgmt_fe_client_cbs {
 				  uintptr_t session_id,
 				  uintptr_t user_session_client,
 				  uint64_t req_id, bool success,
-				  Mgmtd__DatastoreId ds_id,
+				  Mgmtd__DatastoreId ds_id, bool implcit_commit,
 				  char *errmsg_if_any);
 
 	void (*commit_config_notify)(struct mgmt_fe_client *client,
@@ -219,7 +219,8 @@ mgmt_fe_destroy_client_session(struct mgmt_fe_client *client,
  */
 extern int mgmt_fe_send_lockds_req(struct mgmt_fe_client *client,
 				   uint64_t session_id, uint64_t req_id,
-				   Mgmtd__DatastoreId ds_id, bool lock_ds);
+				   Mgmtd__DatastoreId ds_id, bool lock_ds,
+				   bool scok);
 
 /*
  * Send SET_CONFIG_REQ to MGMTD for one or more config data(s).

lib/mgmt_msg.c

@@ -548,20 +548,26 @@ int msg_conn_send_msg(struct msg_conn *conn, uint8_t version, void *msg,
 	if (conn->remote_conn && short_circuit_ok) {
 		uint8_t *buf = msg;
 		size_t n = mlen;
+		bool old;
 
 		if (packf) {
 			buf = XMALLOC(MTYPE_TMP, mlen);
 			n = packf(msg, buf);
 		}
 
+		++conn->short_circuit_depth;
 		MGMT_MSG_DBG(dbgtag, "SC send: depth %u msg: %p",
-			     ++conn->short_circuit_depth, msg);
+			     conn->short_circuit_depth, msg);
 
+		old = conn->remote_conn->is_short_circuit;
+		conn->remote_conn->is_short_circuit = true;
 		conn->remote_conn->handle_msg(version, buf, n,
 					      conn->remote_conn);
+		conn->remote_conn->is_short_circuit = old;
 
+		--conn->short_circuit_depth;
 		MGMT_MSG_DBG(dbgtag, "SC return from depth: %u msg: %p",
-			     conn->short_circuit_depth--, msg);
+			     conn->short_circuit_depth, msg);
 
 		if (packf)
 			XFREE(MTYPE_TMP, buf);
@@ -661,12 +667,10 @@ static bool msg_client_connect_short_circuit(struct msg_client *client)
 	set_nonblocking(sockets[0]);
 	setsockopt_so_sendbuf(sockets[0], client->conn.mstate.max_write_buf);
 	setsockopt_so_recvbuf(sockets[0], client->conn.mstate.max_read_buf);
-	client->conn.is_short_circuit = true;
 
 	/* server side */
 	memset(&su, 0, sizeof(union sockunion));
 	server_conn = server->create(sockets[1], &su);
-	server_conn->is_short_circuit = true;
 
 	client->conn.remote_conn = server_conn;
 	server_conn->remote_conn = &client->conn;

lib/mgmt_msg.h

@@ -98,8 +98,8 @@ struct msg_conn {
 			   struct msg_conn *conn);
 	void *user;
 	uint short_circuit_depth;
+	bool is_short_circuit;	/* true when the message being handled is SC */
 	bool is_client;
-	bool is_short_circuit;
 	bool debug;
 };
 

lib/northbound_cli.c

@@ -763,7 +763,7 @@ DEFUN (config_exclusive,
        "Configuration from vty interface\n"
        "Configure exclusively from this terminal\n")
 {
-	return vty_config_enter(vty, true, true);
+	return vty_config_enter(vty, true, true, false);
 }
 
 /* Configure using a private candidate configuration. */
@@ -773,7 +773,7 @@ DEFUN (config_private,
        "Configuration from vty interface\n"
        "Configure using a private candidate configuration\n")
 {
-	return vty_config_enter(vty, true, false);
+	return vty_config_enter(vty, true, false, false);
 }
 
 DEFPY (config_commit,