server CHANGE compile options for sysrepo timeout and wait

Refs sysrepo/sysrepo#1796

Author: michalvasko

server/CMakeLists.txt

@@ -44,7 +44,13 @@ set(DEFAULT_HOSTKEY "genkey" CACHE STRING "Name of the hostkey from the keystore
 set(THREAD_COUNT 5 CACHE STRING "Number of threads accepting new sessions and handling requests")
 set(MODULES_OWNER "$ENV{USER}" CACHE STRING "User that will become the owner of server modules")
 set(NACM_RECOVERY_UID 0 CACHE STRING "NACM recovery session UID that has unrestricted access")
-set(EDIT_CONFIG_TIMEOUT 0 CACHE STRING "Timeout in seconds of the <edit-config> RPC, 0 is the default sysrepo timeout")
+set(DATA_CHANGE_TIMEOUT 0 CACHE STRING "Timeout in seconds of any (sysrepo) data changes, 0 is the default sysrepo timeout")
+option(DATA_CHANGE_WAIT "Whether to wait for all events on any (sysrepo) data changes" OFF)
+if(DATA_CHANGE_WAIT)
+    set(DATA_CHANGE_WAIT_BOOL 1)
+else()
+    set(DATA_CHANGE_WAIT_BOOL 0)
+endif()
 
 # set prefix for the PID file
 if(NOT PIDFILE_PREFIX)

server/config.h.in

@@ -40,9 +40,13 @@
  */
 #define NP2SRV_NACM_RECOVERY_UID @NACM_RECOVERY_UID@
 
-/** @brief edit-config RPC timeout, 0 is the sysrepo default
+/** @brief timeout for sysrepo operations modifying data, 0 is the sysrepo default
  */
-#define NP2SRV_EDIT_CONFIG_TIMEOUT @EDIT_CONFIG_TIMEOUT@
+#define NP2SRV_DATA_CHANGE_TIMEOUT @DATA_CHANGE_TIMEOUT@
+
+/** @brief Whether to wait on sysrepo data change calls for all the events to be processed
+ */
+#define NP2SRV_DATA_CHANGE_WAIT @DATA_CHANGE_WAIT_BOOL@
 
 /** @brief Starting allocated length for a message
  */

server/netconf.c

@@ -244,7 +244,7 @@ np2srv_rpc_editconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path),
     }
 
     if (!strcmp(testop, "test-then-set")) {
-        rc = sr_apply_changes(session, NP2SRV_EDIT_CONFIG_TIMEOUT, 0);
+        rc = sr_apply_changes(session, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
     } else {
         assert(!strcmp(testop, "test-only"));
         rc = sr_validate(session, 0);
@@ -370,7 +370,7 @@ np2srv_rpc_copyconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path),
 #endif
     {
         /* config is spent */
-        rc = sr_replace_config(session, NULL, config, 0, 0);
+        rc = sr_replace_config(session, NULL, config, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
         config = NULL;
         if (rc != SR_ERR_OK) {
             goto cleanup;
@@ -433,7 +433,7 @@ np2srv_rpc_deleteconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path
     } else
 #endif
     {
-        rc = sr_replace_config(session, NULL, NULL, 0, 0);
+        rc = sr_replace_config(session, NULL, NULL, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
         if (rc != SR_ERR_OK) {
             goto cleanup;
         }
@@ -535,7 +535,7 @@ np2srv_rpc_commit_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), con
     sr_session_switch_ds(session, SR_DS_RUNNING);
 
     /* sysrepo API */
-    rc = sr_copy_config(session, NULL, SR_DS_CANDIDATE, 0, 0);
+    rc = sr_copy_config(session, NULL, SR_DS_CANDIDATE, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
     if (rc != SR_ERR_OK) {
         goto cleanup;
     }
@@ -556,7 +556,7 @@ np2srv_rpc_discard_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), co
     sr_session_switch_ds(session, SR_DS_CANDIDATE);
 
     /* sysrepo API */
-    rc = sr_copy_config(session, NULL, SR_DS_RUNNING, 0, 0);
+    rc = sr_copy_config(session, NULL, SR_DS_RUNNING, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
     if (rc != SR_ERR_OK) {
         goto cleanup;
     }

server/netconf_nmda.c

@@ -310,7 +310,7 @@ np2srv_rpc_editdata_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), c
         goto cleanup;
     }
 
-    rc = sr_apply_changes(session, 0, 0);
+    rc = sr_apply_changes(session, NP2SRV_DATA_CHANGE_TIMEOUT, NP2SRV_DATA_CHANGE_WAIT);
     if (rc != SR_ERR_OK) {
         sr_get_error(session, &err_info);
         sr_set_error(session, err_info->err[0].xpath, err_info->err[0].message);