summaryrefslogtreecommitdiff
path: root/src/cli_new.c
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2011-01-06 13:56:56 -0800
committerStig Thormodsrud <stig@vyatta.com>2011-01-11 16:39:32 -0800
commita8f0172f6afc97d24329a99bbae8b5d09da51a3a (patch)
tree7c9916fde826bfd49cf0cc7f38a8cb67ffd90af4 /src/cli_new.c
parent9280b45e11e1c877d466f34f939eb70f29a669e5 (diff)
downloadvyatta-cfg-a8f0172f6afc97d24329a99bbae8b5d09da51a3a.tar.gz
vyatta-cfg-a8f0172f6afc97d24329a99bbae8b5d09da51a3a.zip
re-enable concurrent configuration commit locking.
locking can be overrode though commit -l flag. (cherry picked from commit c13f949c55df81052c73d394d5ed5ea18a65502b)
Diffstat (limited to 'src/cli_new.c')
-rw-r--r--src/cli_new.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cli_new.c b/src/cli_new.c
index 87f8e8b..2db7996 100644
--- a/src/cli_new.c
+++ b/src/cli_new.c
@@ -461,7 +461,10 @@ get_config_lock()
} else if (fd != -1) {
close(fd);
}
- release_config_lock();
+ //code below will cause a concurrent commit to release lock on failure, and
+ //therefore, allow the concurrent to proceed the second time.
+ //lock can be forced via commit flag instead.
+ // release_config_lock();
}
return ret;
}