[SCM] Samba Shared Repository - branch master updated

2015-11-22 Thread Amitay Isaacs 
The branch, master has been updated
   via  33084a1 ctdb-ipalloc: Drop unnecessary struct ctdb_ipflags
   via  e73496d ctdb-ipalloc: Move memory allocation into 
ipalloc_state_init()
   via  47c5e5a ctdb-ipalloc: Have set_ipflags_internal() set 
ipalloc_state->ipflags
   via  dd163e2 ctdb-ipalloc: Fold IP flags into IP allocation state
   via  22a930a ctdb-ipalloc: Use number of nodes from IP allocation state
   via  1316241 ctdb-ipalloc: Allocate memory off IP allocation state
   via  921e17d ctdb-ipalloc: Add error handling to IP allocation
   via  25c1093 ctdb-ipalloc: Drop CTDB context argument from 
set_ipflags_internal()
  from  0111773 samba-tool:provision: fix bug 11600

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


- Log -
commit 33084a1c2ce74464e9b6b3e8241a7265c1cfbb66
Author: Martin Schwenke 
Date:   Tue Nov 3 16:41:55 2015 +1100

ctdb-ipalloc: Drop unnecessary struct ctdb_ipflags

This can be easily decomposed into 2 separate arrays.

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

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Mon Nov 23 05:34:55 CET 2015 on sn-devel-104

commit e73496d0dc2b8485a808f57d149856baf8a93b72
Author: Martin Schwenke 
Date:   Tue Nov 3 16:36:34 2015 +1100

ctdb-ipalloc: Move memory allocation into ipalloc_state_init()

This puts all of the memory allocation for ipalloc_state into its init
function.  This also simplifies the code because
set_ipflags_internal() can no longer fail because it no longer
allocates memory.

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

commit 47c5e5aa14328a4cbe147dd1ef77f6fd9c69fd5c
Author: Martin Schwenke 
Date:   Tue Nov 3 16:30:23 2015 +1100

ctdb-ipalloc: Have set_ipflags_internal() set ipalloc_state->ipflags

This is cleaner than returning ipflags and assigning them into
ipalloc_state afterwards.

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

commit dd163e26d90ad8de064496cae6849c0fe83abffc
Author: Martin Schwenke 
Date:   Mon Nov 2 16:50:05 2015 +1100

ctdb-ipalloc: Fold IP flags into IP allocation state

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

commit 22a930a0454ef9b98d7d004f65fb15359910a3f6
Author: Martin Schwenke 
Date:   Tue Nov 3 15:29:30 2015 +1100

ctdb-ipalloc: Use number of nodes from IP allocation state

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

commit 13162419be0f01ea67749390b03466f97fa2df80
Author: Martin Schwenke 
Date:   Tue Nov 3 15:26:34 2015 +1100

ctdb-ipalloc: Allocate memory off IP allocation state

Instead of local or passed temporary contexts.

This has the side effect of making ipalloc_state available inside the
modified functions, making future use of ipalloc_state simpler.

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

commit 921e17d81ebbcc5ec4531925f108cff37e562845
Author: Martin Schwenke 
Date:   Fri Oct 30 11:47:22 2015 +1100

ctdb-ipalloc: Add error handling to IP allocation

The only likely failure is out of memory, so just return boolean
value.

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

commit 25c10936eb5a800e7f0a5874a4093581ac5da9af
Author: Martin Schwenke 
Date:   Sat Oct 31 06:48:23 2015 +1100

ctdb-ipalloc: Drop CTDB context argument from set_ipflags_internal()

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

---

Summary of changes:
 ctdb/server/ctdb_takeover.c  | 203 ++-
 ctdb/tests/src/ctdb_takeover_tests.c |  33 +++---
 2 files changed, 116 insertions(+), 120 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index d99f9aa..00d35e1 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -48,11 +48,6 @@
 #define CTDB_ARP_REPEAT   3
 
 /* Flags used in IP allocation algorithms. */
-struct ctdb_ipflags {
-   bool noiptakeover;
-   bool noiphost;
-};
-
 enum ipalloc_algorithm {
IPALLOC_DETERMINISTIC,
IPALLOC_NONDETERMINISTIC,
@@ -65,6 +60,8 @@ struct ipalloc_state {
/* Arrays with data for each node */
struct ctdb_public_ip_list_old

autobuild[sn-devel-144]: intermittent test failure detected

2015-11-22 Thread autobuild 
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2015-11-23-0144/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-11-23-0144/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-11-23-0144/samba.stdout
  
The top commit at the time of the failure was:

commit 0111773310ea1ef63ab0d7b256f29aa7e27b545b
Author: Rowland Penny 
Date:   Mon Nov 16 16:22:31 2015 +

samba-tool:provision: fix bug 11600

If you join a second DC after changing the name of
the 'Default Domain Policy' or 'Default Domain Controllers
Policy' the join will fail as the search is hardcoded to
these names, this fix changes the search to the objects name.

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

Signed-off-by: Rowland Penny 
Reviewed-by: Michael Adam 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Sat Nov 21 04:44:58 CET 2015 on sn-devel-104