"ovsdb-tool compact SRC DST" and "ovsdb-tool convert SRC SCHEMA DST" do not
need to lock SRC, because they do not modify it.
Reported-by: Justin Pettit <jpettit@nicira.com>
struct ovsdb *db;
int retval;
struct ovsdb *db;
int retval;
- /* Get (temporary) destination. */
+ /* Lock the source, if we will be replacing it. */
- dst_name = xasprintf("%s.tmp", src_name);
+ retval = lockfile_lock(src_name, INT_MAX, &src_lock);
+ if (retval) {
+ ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
+ }
- /* Lock source and (temporary) destination. */
- retval = lockfile_lock(src_name, INT_MAX, &src_lock);
- if (retval) {
- ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
+ /* Get (temporary) destination and lock it. */
+ if (in_place) {
+ dst_name = xasprintf("%s.tmp", src_name);
retval = lockfile_lock(dst_name, INT_MAX, &dst_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
retval = lockfile_lock(dst_name, INT_MAX, &dst_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
dst_name, src_name);
}
fsync_parent_dir(dst_name);
dst_name, src_name);
}
fsync_parent_dir(dst_name);
lockfile_unlock(src_lock);
}
lockfile_unlock(src_lock);
}