[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  11fa417 selftest: check for fs specific options of the share dir only after creating it
       via  9d6f187 ctdb:vacuum: stop vacuuming when the first delete_list traverse fails.
      from  f87b7f6 ctdb-vacuum: Use existing function ctdb_marshall_finish

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 11fa417037a0b1df4da7311114d243cf0a764324
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 22 00:31:16 2014 +0200

    selftest: check for fs specific options of the share dir only after creating it
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Wed Jul 23 17:37:34 CEST 2014 on sn-devel-104

commit 9d6f187b5811faed6e9b6c4bc61e42175c0c0ae2
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 23 13:34:03 2014 +0200

    ctdb:vacuum: stop vacuuming when the first delete_list traverse fails.
    
    This indirect caller of delete_marshall_traverse was missed
    in fa4a81c86b6073b2563b090aa657d8e8b63c1276
    which lets failure of the second travers fail the vacuum run.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_vacuum.c |    1 +
 selftest/target/Samba3.pm |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index be3ee1e..c3054bf 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -898,6 +898,7 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db,
 	if (ret != 0) {
 		DEBUG(DEBUG_ERR, (__location__ " Error traversing the "
 		      "delete list for first marshalling.\n"));
+		goto done;
 	}
 
 	indata = ctdb_marshall_finish(recs->records);
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index a6d85cc..6c34dbb 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -875,8 +875,6 @@ sub provision($$$$$$)
 	my $nmbdsockdir="$prefix_abs/nmbd";
 	unlink($nmbdsockdir);
 
-	my $fs_specific_conf = $self->get_fs_specific_conf($shrdir);
-
 	## 
 	## create the test directory layout
 	##
@@ -890,6 +888,8 @@ sub provision($$$$$$)
 	}
 	mkdir($_, 0777) foreach(@dirs);
 
+	my $fs_specific_conf = $self->get_fs_specific_conf($shrdir);
+
 	##
 	## lockdir and piddir must be 0755
 	##


-- 
Samba Shared Repository