autobuild: intermittent test failure detected

[autobuild]

The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-07-08-0337/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-07-08-0337/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-07-08-0337/samba.stdout
  
The top commit at the time of the failure was:

commit fdc9a322b1e346fe95dc59749f3c77d6ff27d7de
Author: Garming Sam 
Date:   Thu Jul 3 16:04:06 2014 +1200

param: Amend docs.py test to check dumping of flagged parameters

This test uses an empty smb.conf file to check if the resulting
output from testparm is empty.

It also sets a parameter as default in an smb.conf file and then
sets the option on the command line to ensure they are displayed
correctly.

Change-Id: I48f05b6e3c9e5cd856e89b196e00ae35eb93bf9f
Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Tue Jul  8 01:57:59 CEST 2014 on sn-devel-104

[SCM] CTDB repository - branch 2.5 updated - ctdb-2.5.3-71-g9455d80

[Amitay Isaacs]

The branch, 2.5 has been updated
   via  9455d80a14588cce58ca494725a4eb031ae34e14 (commit)
   via  093e219716b2a3027a06176dd2385051657fc101 (commit)
   via  27fd360aa3575afa24f27901e5be6d2f9cbbfb99 (commit)
   via  3460c619ed998bcdba2df630a8daaada65fb2b0b (commit)
  from  00534e6ca28d8a2e47118338ca1cda4d3bd79486 (commit)

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


- Log -
commit 9455d80a14588cce58ca494725a4eb031ae34e14
Author: Amitay Isaacs 
Date:   Thu Jul 3 13:47:07 2014 +1000

recoverd: No need to set ctdbd_pid again

This is unnecessary since ctdbd_pid is set very early in the code before
creating any other processes including recovery daemon.

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Sat Jul  5 09:20:27 CEST 2014 on sn-devel-104

(Imported from commit 331fb7fc64c0a4f64c28001a1644a2a6a923be75)

commit 093e219716b2a3027a06176dd2385051657fc101
Author: Martin Schwenke 
Date:   Thu Jul 3 12:29:46 2014 +1000

daemon: Remove ctdbd_pid global variable

This duplicates ctdb->ctdbd_pid.

Thanks to Sumit Bose  for the suggestion.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

(Imported from commit 1677dd499c571081a8ddaf560eb3b033156e1c67)

commit 27fd360aa3575afa24f27901e5be6d2f9cbbfb99
Author: Martin Schwenke 
Date:   Mon Jun 30 17:22:14 2014 +1000

daemon: Check PID in ctdb_remove_pidfile(), not unreliable flag

If something unexpectedly uses fork() then an exiting child will
remove the PID file while the main daemon is still running.  The real
test is whether the current process has the PID of the main CTDB
daemon, which is the process that calls setsid().

This could be done using getpgrp() instead.  At the moment the
eventscript handler harmlessly calls setpgid() - harmless because the
atexit() handlers are cleared upon exec().  However, it is possible
that process groups will be used more in future so it is probably
better to rely on the session ID.

Thanks to Sumit Bose  for the idea.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

(Imported from commit e454e5ac9c8ed77409d9fa4463b2b29985e67e10)

commit 3460c619ed998bcdba2df630a8daaada65fb2b0b
Author: Martin Schwenke 
Date:   Thu Jul 3 12:12:20 2014 +1000

daemon: Exit if setting the session ID fails

Currently ctdbd_wrapper depends on the session ID.  Very soon PID file
removal will too.  :-)

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

(Imported from commit c7b3be97d96ee5a17bb88dceec42c57e9bf69c5d)

---

Summary of changes:
 client/ctdb_client.c   |2 --
 common/ctdb_fork.c |8 
 include/ctdb_private.h |5 -
 server/ctdb_daemon.c   |   20 
 server/ctdb_recoverd.c |2 --
 5 files changed, 12 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 73c593f..c8ab1cd 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -29,8 +29,6 @@
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
 
-pid_t ctdbd_pid;
-
 /*
   allocate a packet for use in client<->daemon communication
  */
diff --git a/common/ctdb_fork.c b/common/ctdb_fork.c
index aa9bcf0..d7eef76 100644
--- a/common/ctdb_fork.c
+++ b/common/ctdb_fork.c
@@ -23,11 +23,8 @@
 #include "../include/ctdb_private.h"
 #include "../common/rb_tree.h"
 
-static bool is_child = false;
-
 void ctdb_set_child_info(TALLOC_CTX *mem_ctx, const char *child_name_fmt, ...)
 {
-   is_child = true;
if (child_name_fmt != NULL) {
va_list ap;
char *t;
@@ -40,11 +37,6 @@ void ctdb_set_child_info(TALLOC_CTX *mem_ctx, const char 
*child_name_fmt, ...)
}
 }
 
-bool ctdb_is_child_process(void)
-{
-   return is_child;
-}
-
 void ctdb_track_child(struct ctdb_context *ctdb, pid_t pid)
 {
char *process;
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 0481e43..de7880b 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -38,11 +38,6 @@ struct srvid_request_data {
 };
 
 /*
- * pid of the ctdbd daemon
- */
-extern pid_t ctdbd_pid;
-
-/*
   a tcp connection description
   also used by tcp_add and tcp_remove controls
  */
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index 391f244..da2f42e 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -60,7 +60,7 @@ static void ctdb_time_tick(struct event_context *ev, struct 
timed_event *te,
 {
struct ctdb_context *ctdb = talloc_get_type(private_data, struct 
ctdb_context);
 
-   if (getpid() != ctdbd_pid) {
+   if (getpid() != ctdb->c

[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
   via  fdc9a32 param: Amend docs.py test to check dumping of flagged 
parameters
   via  cafe296 param: remove idmap parameters as special cases in docs.py
   via  0eacbb6 param: change snum parameter in special functions to a 
loadparm_service pointer
   via  9f519ca s3:param: pass down lp_ctx in handle include
   via  76001ab lib/param: rename do_parameter to lpcfg_do_parameter
   via  e87cb83 param: handle smb_ports as a special handler
   via  8947af1 param: Use set_variable instead of set_variable_helper in 
lp_do_parameter
   via  21d5c66 param: add failure case for loadparm_init_s3
   via  8628481 param: store the flags_list in the s3 lp context used for 
special
   via  c76a8a1 param: mark non default options using flags in s3
   via  edc321d param: fix FLAG_CMDLINE to be stored outside of the param 
table
   via  124140f param: remove unnecessary dump a service
   via  e1c50d9 param: simplify lp_do_parameter
   via  39fb65e param: replace lp_set_cmdline in s3 helpers to store_cmdline
   via  85f5f86 param: Ensure the correct mem context is always being used 
from s3
   via  288e29b param: set the flags on a s3 loadparm context
   via  090fb5a param: flag fixes in s3 loadparm
   via  2d9b302 param: attempt to start factoring out the bInGlobalSection 
parameter
   via  a4f2f3a param: allow fallback to s3 do_section in lib/param
   via  5a17187 param: add do_section to s3 helpers
   via  acc7f79 param: rename do_section in s3 to lp_do_section to avoid 
conflicts
   via  5c0ce80 param: remove unnecessary calls to do_parameter in s3
   via  83bc583 lib/param: add deprecated warning to be consistent with s3
   via  ee722f4 param: remove unnecessary lp_local_ptr_by_snum function
   via  6ad9333 param: avoid the use of lp_do_parameter in popt
   via  bdbafe5 param: move defaults_saved global out of dump_globals 
function
   via  f1c28fc param: use set_variable_helper in s3 loadparm
   via  5b5e3ec param: finish the set_param_helper lineup by rearranging 
case order
   via  bc810ee param: make some more changes to lp_do_parameter to match 
set_variable_helper
   via  5da04ac lib/param: change set_variable_helper formatting
   via  f47df32 param: attempt to align the set_variable_helper with 
lp_do_parameter
   via  867ed27 param: use str_list_make_v3 instead of str_list_make in s3
   via  cafd607 param: Add null checks for upcoming str_list_make changes
   via  72651f9 param: pre-emptively correct use of str_list_make_v3 in 
lib/param
   via  e9a2694 lib/param: factor out a common portion of set_variable
   via  eda92c7 param: Use the plus/minus syntax for reading in lists in s3 
loadparm
   via  93448f4 param: change a number of parameters from P_LIST to 
P_CMDLIST
   via  d6486cf param: ensure CMD_LIST is freed when freeing a parameter
  from  49b500a smbcacls: parse config file argument prior to load

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


- Log -
commit fdc9a322b1e346fe95dc59749f3c77d6ff27d7de
Author: Garming Sam 
Date:   Thu Jul 3 16:04:06 2014 +1200

param: Amend docs.py test to check dumping of flagged parameters

This test uses an empty smb.conf file to check if the resulting
output from testparm is empty.

It also sets a parameter as default in an smb.conf file and then
sets the option on the command line to ensure they are displayed
correctly.

Change-Id: I48f05b6e3c9e5cd856e89b196e00ae35eb93bf9f
Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Tue Jul  8 01:57:59 CEST 2014 on sn-devel-104

commit cafe2966a00061732e72ffb37c1d7a338152171b
Author: Garming Sam 
Date:   Tue May 6 16:21:50 2014 +1200

param: remove idmap parameters as special cases in docs.py

Change-Id: Ie2395ddbe9e055b9972fd859615a022d9f675014
Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Nadezhda Ivanova 

commit 0eacbb6c960da27a12487ae74ca8a53274e416f3
Author: Garming Sam 
Date:   Thu Mar 20 12:57:22 2014 +1300

param: change snum parameter in special functions to a loadparm_service 
pointer

Using either an snum or the current service for special functions
depending where it was called is unnecessary and complicates the process
of handling them generically.

idmap parameters now call lpcfg_do_parameter_parametric and are now set
like normal.

Change-Id: I3eca89791274280f9d3c7b987fbd790c16ec7981
Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Nadezhda Ivanova 

commit 9f519cabfadf0025eefafb938045f9f849cdf3bc
Author: Garming Sam 
Date:   Thu Mar 20 11:30:39 2014 +1300

 

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  49b500a smbcacls: parse config file argument prior to load
  from  f0adcf3 net/doc: make clear that net vampire is for NT4 domains only

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


- Log -
commit 49b500a61f0e1ed9d02654597c0785e7a1b933e9
Author: David Disseldorp 
Date:   Mon Jul 7 15:24:19 2014 +0200

smbcacls: parse config file argument prior to load

Fixes usage with the common "-s|--configfile" parameter.

Signed-off-by: David Disseldorp 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Mon Jul  7 23:30:50 CEST 2014 on sn-devel-104

---

Summary of changes:
 source3/utils/smbcacls.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 47d75fe..c771225 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1408,8 +1408,6 @@ int main(int argc, char *argv[])
 
setlinebuf(stdout);
 
-   lp_load_global(get_dyn_CONFIGFILE());
-   load_interfaces();
 
auth_info = user_auth_info_init(frame);
if (auth_info == NULL) {
@@ -1480,6 +1478,9 @@ int main(int argc, char *argv[])
return -1;
}
 
+   lp_load_global(get_dyn_CONFIGFILE());
+   load_interfaces();
+
filename = talloc_strdup(frame, poptGetArg(pc));
if (!filename) {
return -1;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
   via  f0adcf3 net/doc: make clear that net vampire is for NT4 domains only
  from  21d09dc torture4: Add trivial epoch test

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


- Log -
commit f0adcf33b83f6fe5098a618e4da46cfb185b2166
Author: Björn Jacke 
Date:   Fri Jun 13 14:14:41 2014 +0200

net/doc: make clear that net vampire is for NT4 domains only

https://bugzilla.samba.org/show_bug.cgi?id=3263

Reviewed-by: Volker Lendecke 
Reviewed-by: Michael Adam 

Autobuild-User(master): Björn Jacke 
Autobuild-Date(master): Mon Jul  7 21:01:25 CEST 2014 on sn-devel-104

---

Summary of changes:
 docs-xml/manpages/net.8.xml |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 49cab42..8524d1f 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -1229,6 +1229,8 @@ to run this against the PDC, from a Samba machine joined 
as a BDC. 
 
 Export users, aliases and groups from remote server to 
 local server.  You need to run this against the PDC, from a Samba machine 
joined as a BDC. 
+This vampire command cannot be used against an Active Directory, only
+against an NT4 Domain Controller.
 
 
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
   via  21d09dc torture4: Add trivial epoch test
   via  8b9f96e torture4: Add smb2.lease.nobreakself
   via  b597d47 torture4: Add a test to break a handle twice
   via  296739d torture4: Make sure we copy the parent_lease_key
   via  618b6fd smbd: Use BVAL
  from  eccce07 ctdb-tests: Add a test for ctdb restoredb

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


- Log -
commit 21d09dc7b85b57bcfe7cd4f57f7173eb9b3601d4
Author: Volker Lendecke 
Date:   Fri Jul 4 13:27:17 2014 +

torture4: Add trivial epoch test

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Jul  7 18:36:37 CEST 2014 on sn-devel-104

commit 8b9f96e83b304e291b3f2b7095e9bd9ea2a90981
Author: Volker Lendecke 
Date:   Tue Sep 24 10:26:48 2013 -0700

torture4: Add smb2.lease.nobreakself

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

commit b597d47241ed56bcc6000d9397f19431c3cc5b96
Author: Volker Lendecke 
Date:   Tue Sep 24 17:07:54 2013 -0700

torture4: Add a test to break a handle twice

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

commit 296739d655db40b8acc68edc3168fb8c81a95c88
Author: Volker Lendecke 
Date:   Mon Sep 23 19:41:13 2013 -0700

torture4: Make sure we copy the parent_lease_key

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

commit 618b6fdef85006904370a1a35ba87c70673ee647
Author: Volker Lendecke 
Date:   Thu Jul 3 15:35:33 2014 +

smbd: Use BVAL

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

---

Summary of changes:
 selftest/knownfail   |4 +
 source3/smbd/trans2.c|   12 +--
 source4/torture/smb2/lease.c |  264 +-
 3 files changed, 266 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index 624a5ae..7d1702d 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -200,6 +200,10 @@
 ^samba3.smb2.lease.oplock
 ^samba3.smb2.lease.multibreak
 ^samba3.smb2.lease.v2_request
+^samba3.smb2.lease.v2_request_parent
+^samba3.smb2.lease.break_twice
+^samba3.smb2.lease.nobreakself
+^samba3.smb2.lease.v2_epoch1
 ^samba3.smb2.oplock.batch20
 ^samba3.smb2.oplock.stream1
 ^samba3.smb2.streams.rename
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a95edf8..9003cc4 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5167,10 +5167,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
 
smblctx = (uint64_t)IVAL(pdata, POSIX_LOCK_PID_OFFSET);
 #if defined(HAVE_LONGLONG)
-   offset = (((uint64_t) 
IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
-   ((uint64_t) 
IVAL(pdata,POSIX_LOCK_START_OFFSET));
-   count = (((uint64_t) 
IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
-   ((uint64_t) 
IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
+   offset = BVAL(pdata,POSIX_LOCK_START_OFFSET);
+   count = BVAL(pdata,POSIX_LOCK_LEN_OFFSET);
 #else /* HAVE_LONGLONG */
offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET);
count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
@@ -5191,10 +5189,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0);
SIVAL(pdata, POSIX_LOCK_PID_OFFSET, 
(uint32_t)smblctx);
 #if defined(HAVE_LONGLONG)
-   SIVAL(pdata, POSIX_LOCK_START_OFFSET, 
(uint32)(offset & 0x));
-   SIVAL(pdata, POSIX_LOCK_START_OFFSET + 4, 
(uint32)((offset >> 32) & 0x));
-   SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, 
(uint32)(count & 0x));
-   SIVAL(pdata, POSIX_LOCK_LEN_OFFSET + 4, 
(uint32)((count >> 32) & 0x));
+   SBVAL(pdata, POSIX_LOCK_START_OFFSET, offset);
+   SBVAL(pdata, POSIX_LOCK_LEN_OFFSET, count);
 #else /* HAVE_LONGLONG */
SIVAL(pdata, POSIX_LOCK_START_OFFSET, offset);
SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, count);
diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
index 045f994..4326958 100644
--- a/source4/torture/smb2/lease.c
+++ b/source4/torture/smb2/lease.c
@@ -69,7 +69,7 @@
CHECK_VAL((__io)->out.lease_response.lease_duration, 0); \
} while(0)
 
-#define CHECK_LEASE_V2(__io, __state, __oplevel, __key, __

[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
   via  eccce07 ctdb-tests: Add a test for ctdb restoredb
   via  9c8c8a7 ctdb-tests: Check that ctdb wipedb cleans the database
   via  2855173 ctdb-daemon: Do not thaw databases if recovery is active
   via  28a1b75 ctdb-recoverd: Set recovery mode before freezing databases
   via  72c6500 ctdb-tools: There is no need for forcing a recovery
   via  e5cd81d Revert "It was possible for ->recovery_mode to get out of 
sync with the new three db priorities in such a way that"
  from  1be8564 ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO

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


- Log -
commit eccce073d084eceb4bfb5c25001b5873e2c0f2b2
Author: Amitay Isaacs 
Date:   Tue May 6 17:44:24 2014 +1000

ctdb-tests: Add a test for ctdb restoredb

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

Autobuild-User(master): Martin Schwenke 
Autobuild-Date(master): Mon Jul  7 16:06:39 CEST 2014 on sn-devel-104

commit 9c8c8a7b0bfd4c1cafa3deaa012049b7f0851617
Author: Amitay Isaacs 
Date:   Tue May 6 17:16:19 2014 +1000

ctdb-tests: Check that ctdb wipedb cleans the database

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

commit 2855173dac5386bff655d1bb94c1848591b963e1
Author: Amitay Isaacs 
Date:   Tue May 6 14:20:44 2014 +1000

ctdb-daemon: Do not thaw databases if recovery is active

This prevents ctdb tool from thawing databases prematurely in
thaw/wipedb/restoredb commands if recovery is active.

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

commit 28a1b75886fb4aea65e23bfd00b9f4c98780fdfd
Author: Amitay Isaacs 
Date:   Tue May 6 14:24:52 2014 +1000

ctdb-recoverd: Set recovery mode before freezing databases

Setting recovery mode to active is the only correct way to inform recovery
daemon to run database recovery.  Only freezing databases without setting
recovery mode should not trigger database recovery, as this mechanism
is used in tool to implement wipedb/restoredb commands.

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

commit 72c6500ee440779819b9adb768a7022cc251f07e
Author: Amitay Isaacs 
Date:   Tue May 6 14:15:45 2014 +1000

ctdb-tools: There is no need for forcing a recovery

This effectively reverts commit 442953c540424ad0c64f4264b5ee27c45a3130e8.
The correct way of telling recovery daemon to trigger a database recovery is
by setting recovery mode to active.  There is no need to freeze databases as
recovery master will do that across the cluster anyway.

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

commit e5cd81da77ef58992b7eb9ff7d972b499b946bb7
Author: Amitay Isaacs 
Date:   Tue May 6 14:07:00 2014 +1000

Revert "It was possible for ->recovery_mode to get out of sync with the new 
three db priorities in such a way that"

This reverts commit 6578a97bd94fc14d5b6df85b84e50447f7bdb2e3.

This condition cannot happen since when recovery is triggered, all the
databases would get frozen and thawed in the order of priority.  The only
other place where databases get frozen are for implementation of ctdb
wipedb/restoredb commands.

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

---

Summary of changes:
 ctdb/include/ctdb_private.h|3 +-
 ctdb/server/ctdb_banning.c |2 +-
 ctdb/server/ctdb_control.c |   13 +---
 ctdb/server/ctdb_freeze.c  |   13 +++-
 ctdb/server/ctdb_recover.c |2 +-
 ctdb/server/ctdb_recoverd.c|   42 ++--
 ctdb/tests/simple/58_ctdb_restoredb.sh |  118 
 ctdb/tests/simple/71_ctdb_wipedb.sh|   10 +++
 ctdb/tools/ctdb.c  |   13 
 9 files changed, 165 insertions(+), 51 deletions(-)
 create mode 100755 ctdb/tests/simple/58_ctdb_restoredb.sh


Changeset truncated at 500 lines:

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index de7880b..aeebed1 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1059,7 +1059,8 @@ void ctdb_request_control_reply(struct ctdb_context 
*ctdb, struct ctdb_req_contr
TDB_DATA *outdata, int32_t status, const char 
*errormsg);
 
 int32_t ctdb_control_freeze(struct ctdb_context *ctdb, struct ctdb_req_control 
*c, bool *async_reply);
-int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority);
+int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority,
+ bool check_recmode);
 
 int ctdb_start_recoverd(struct ctdb_context *ctdb);
 void ctdb_stop_recoverd(struct ctdb_context *ctdb);
diff --git a/ctdb/server/ctdb_banning.

[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
   via  1be8564 ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO
   via  a283b9e ctdb-recoverd: Don't say "Election timed out"
   via  8bdb9b8 ctdb-recoverd: Log a message when releasing the recovery 
lock
   via  61b1fde ctdb-scripts: Support NFS on RHEL7 with systemd
  from  1dddf6c auth: Fix an incompatible pointer assignment

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


- Log -
commit 1be8564e553ce044426dbe7b3987edf514832940
Author: Martin Schwenke 
Date:   Sat May 31 14:01:53 2014 +1000

ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO

This makes the scheduler reset code a no-op.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Mon Jul  7 13:28:25 CEST 2014 on sn-devel-104

commit a283b9e43a602b9c72065336edbe8ad7c2499117
Author: Martin Schwenke 
Date:   Fri Jun 20 13:36:25 2014 +1000

ctdb-recoverd: Don't say "Election timed out"

That makes people think there's a problem (and report bugs) so say
something a bit less scary instead...

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 8bdb9b85cc02f589a3b219de07f3c2ef7510d937
Author: Martin Schwenke 
Date:   Fri Jun 20 10:51:16 2014 +1000

ctdb-recoverd: Log a message when releasing the recovery lock

It is a non-trivial event and will make it easier to debug recovery
lock issues.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 61b1fdec2fdb19be9b9cd39bc5298917e914cc04
Author: Martin Schwenke 
Date:   Thu Jun 26 10:36:17 2014 +1000

ctdb-scripts: Support NFS on RHEL7 with systemd

Need to be able to recognise a RHEL system.  Still use "system" to
start and stop service, since that still works and yields the smallest
change.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

---

Summary of changes:
 ctdb/common/system_util.c   |8 +++-
 ctdb/config/functions   |6 --
 ctdb/server/ctdb_recoverd.c |3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 6a5f454..fe0f403 100644
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -59,10 +59,14 @@ void set_scheduler(void)
 #else /* no AIX */
 #if HAVE_SCHED_SETSCHEDULER
struct sched_param p;
+   int policy = SCHED_FIFO;
 
p.sched_priority = 1;
 
-   if (sched_setscheduler(0, SCHED_FIFO, &p) == -1) {
+#ifdef SCHED_RESET_ON_FORK
+   policy |= SCHED_RESET_ON_FORK;
+#endif
+   if (sched_setscheduler(0, policy, &p) == -1) {
DEBUG(DEBUG_CRIT,("Unable to set scheduler to SCHED_FIFO 
(%s)\n",
 strerror(errno)));
} else {
@@ -92,6 +96,7 @@ void reset_scheduler(void)
 #endif
 #else /* no AIX */
 #if HAVE_SCHED_SETSCHEDULER
+#ifndef SCHED_RESET_ON_FORK
struct sched_param p;
 
p.sched_priority = 0;
@@ -100,6 +105,7 @@ void reset_scheduler(void)
}
 #endif
 #endif
+#endif
 }
 
 void set_nonblocking(int fd)
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 6bc0312..3f2ccee 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -681,7 +681,8 @@ startstop_nfs() {
[ -x $CTDB_ETCDIR/init.d/nfsserver ] && {
PLATFORM="sles"
}
-   [ -x $CTDB_ETCDIR/init.d/nfslock ] && {
+   [ -x $CTDB_ETCDIR/init.d/nfslock -o \
+   -r /usr/lib/systemd/system/nfs-lock.service ] && {
PLATFORM="rhel"
}
 
@@ -761,7 +762,8 @@ startstop_nfslock() {
[ -x $CTDB_ETCDIR/init.d/nfsserver ] && {
PLATFORM="sles"
}
-   [ -x $CTDB_ETCDIR/init.d/nfslock ] && {
+   [ -x $CTDB_ETCDIR/init.d/nfslock -o \
+   -r /usr/lib/systemd/system/nfs-lock.service ] && {
PLATFORM="rhel"
}
 
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index cfba29d..f553f67 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1168,7 +1168,7 @@ static void ctdb_election_timeout(struct event_context 
*ev, struct timed_event *
rec->election_timeout = NULL;
fast_start = false;
 
-   DEBUG(DEBUG_WARNING,(__location__ " Election timed out\n"));
+   DEBUG(DEBUG_WARNING,("Election period ended\n"));
 }
 
 
@@ -2716,6 +2716,7 @@ static void election_handler(struct ctdb_context *ctdb, 
uint64_t srvid,
/* release the recmaster lock */
if (em->pnn != ctdb->pnn &&
ctdb->recovery_lock_fd != -1) {
+   DEBUG(DEBUG_NOTICE, ("Release the recovery lock\n"));
close

[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
   via  039297d s3:winbindd - fix bad bugfix for bug #10280 - winbind panic 
if AD server is down.
  from  34e7133 s3/s4: smbd, rpc, ldap, cldap, kdc services.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -
commit 039297dad9724cf5924d83a43cd8b4661cdf8a8b
Author: Jeremy Allison 
Date:   Tue Jul 1 20:27:11 2014 -0700

s3:winbindd - fix bad bugfix for bug #10280 - winbind panic if AD server is 
down.

Previous bug fix reversed the sense of the test for out of memory.

https://bugzilla.samba.org/show_bug.cgi?id=10280

Signed-off-by: Jeremy Allison 

Autobuild-User(v4-0-test): Karolin Seeger 
Autobuild-Date(v4-0-test): Mon Jul  7 12:37:48 CEST 2014 on sn-devel-104

---

Summary of changes:
 source3/winbindd/winbindd_cache.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c 
b/source3/winbindd/winbindd_cache.c
index 860526b..050ec6c 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2121,14 +2121,14 @@ static NTSTATUS rids_to_names(struct winbindd_domain 
*domain,
have_mapped = have_unmapped = false;
 
*names = talloc_array(mem_ctx, char *, num_rids);
-   if (*names != NULL) {
+   if (*names == NULL) {
result = NT_STATUS_NO_MEMORY;
goto error;
}
 
*types = talloc_array(mem_ctx, enum lsa_SidType,
  num_rids);
-   if (*types != NULL) {
+   if (*types == NULL) {
result = NT_STATUS_NO_MEMORY;
goto error;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
   via  1dddf6c auth: Fix an incompatible pointer assignment
  from  ee32bc2 Order switch statements

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


- Log -
commit 1dddf6c24ac87baad0d65db3d13d27e651f81499
Author: Volker Lendecke 
Date:   Thu Jul 3 13:58:17 2014 +

auth: Fix an incompatible pointer assignment

Signed-off-by: Volker Lendecke 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Jul  7 10:58:30 CEST 2014 on sn-devel-104

---

Summary of changes:
 source3/auth/auth_samba4.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 284a91f..0a80d17 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -188,7 +188,7 @@ static NTSTATUS check_samba4_security(const struct 
auth_context *auth_context,
  * token is generated and used in the SMB and LDAP servers, for NTLM
  * and for Kerberos.
  */
-static NTSTATUS prepare_gensec(struct auth_context *auth_context,
+static NTSTATUS prepare_gensec(const struct auth_context *auth_context,
   TALLOC_CTX *mem_ctx,
   struct gensec_security **gensec_context)
 {


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

[autobuild]

The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-07-07-0937/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-07-07-0937/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-07-07-0937/samba.stdout
  
The top commit at the time of the failure was:

commit ee32bc2cfbe77c623b60fb44715e324c2cc45952
Author: Samuel Cabrero 
Date:   Sun Jul 6 22:02:42 2014 +0200

Order switch statements

Signed-off-by: Samuel Cabrero 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Kamen Mazdrashki 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Mon Jul  7 07:47:44 CEST 2014 on sn-devel-104