[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f2d67af tdb: Fix undefined prototype warnings
via 1beb4bc tdb: Fix
in error messages
from 94f11e9 s3-net: Fix rpc_service_list_internal() null pointer
passing.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f2d67af7bc0b316f54d6cc1a44d07f1b24244378
Author: Volker Lendecke v...@samba.org
Date: Fri Dec 14 22:49:05 2012 +0100
tdb: Fix undefined prototype warnings
These functions are deliberately left without prototypes according to
3fdeaa399, but without prototypes we get warnings.
Reviewed-by: Rusty Russell ru...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Mon Jan 7 11:20:19 CET 2013 on sn-devel-104
commit 1beb4bc9d12fb124935e9e4710f48ad616dacc60
Author: Volker Lendecke v...@samba.org
Date: Wed Dec 26 21:42:14 2012 +0100
tdb: Fix \n in error messages
Reviewed-by: Rusty Russell ru...@samba.org
---
Summary of changes:
lib/tdb/common/lock.c |2 ++
lib/tdb/tools/tdbtorture.c |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c
index 7155a9f..b530c6e 100644
--- a/lib/tdb/common/lock.c
+++ b/lib/tdb/common/lock.c
@@ -883,12 +883,14 @@ void tdb_release_transaction_locks(struct tdb_context
*tdb)
/* Following functions are added specifically to support CTDB. */
/* Don't do actual fcntl locking, just mark tdb locked */
+int tdb_transaction_write_lock_mark(struct tdb_context *tdb);
_PUBLIC_ int tdb_transaction_write_lock_mark(struct tdb_context *tdb)
{
return tdb_transaction_lock(tdb, F_WRLCK, TDB_LOCK_MARK_ONLY);
}
/* Don't do actual fcntl unlocking, just mark tdb unlocked */
+int tdb_transaction_write_lock_unmark(struct tdb_context *tdb);
_PUBLIC_ int tdb_transaction_write_lock_unmark(struct tdb_context *tdb)
{
return tdb_nest_unlock(tdb, TRANSACTION_LOCK, F_WRLCK, true);
diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index 64c5043..04bbb7d 100644
--- a/lib/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
@@ -438,10 +438,10 @@ done:
db = tdb_open_ex(test_tdb, hash_size, TDB_DEFAULT,
O_RDWR, 0, log_ctx, NULL);
if (!db) {
- fatal(db open failed);
+ fatal(db open failed\n);
}
if (tdb_check(db, NULL, NULL) == -1) {
- printf(db check failed);
+ printf(db check failed\n);
exit(1);
}
tdb_close(db);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6a5afa2 spoolss: add stubs for new JobNamedProperty dcerpc calls.
via 638ed90 spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.
via 22994ca spoolss: add Windows ARM architecture defines to IDL.
from f2d67af tdb: Fix undefined prototype warnings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6a5afa244203c42265207c56e95783ec740ee89e
Author: Günther Deschner g...@samba.org
Date: Mon Jan 7 15:15:21 2013 +0100
spoolss: add stubs for new JobNamedProperty dcerpc calls.
Guenther
Signed-off-by: Günther Deschner g...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Mon Jan 7 19:06:25 CET 2013 on sn-devel-104
commit 638ed90620e3c6a35ef56a11c612c13d6b7d6ff5
Author: Günther Deschner g...@samba.org
Date: Mon Jan 7 15:14:30 2013 +0100
spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.
Guenther
Signed-off-by: Günther Deschner g...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
commit 22994ca92ba92711e20da482292603927a82704e
Author: Günther Deschner g...@samba.org
Date: Mon Jan 7 15:14:02 2013 +0100
spoolss: add Windows ARM architecture defines to IDL.
Guenther
Signed-off-by: Günther Deschner g...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
---
Summary of changes:
librpc/idl/spoolss.idl | 27 -
source3/rpc_server/spoolss/srv_spoolss_nt.c | 44 +++
source4/rpc_server/spoolss/dcesrv_spoolss.c | 37 ++
3 files changed, 107 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 1a5f5e9..06a0935 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -35,11 +35,13 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
typedef enum {
PROCESSOR_ARCHITECTURE_INTEL= 0x,
+ PROCESSOR_ARCHITECTURE_ARM = 0x0005,
PROCESSOR_ARCHITECTURE_IA64 = 0x0006,
PROCESSOR_ARCHITECTURE_AMD64= 0x0009
} spoolss_ProcessorArchitecture;
typedef [v1_enum] enum {
+ PROCESSOR_ARM = 0x,
PROCESSOR_INTEL_386 = 0x0182,
PROCESSOR_INTEL_486 = 0x01E6,
PROCESSOR_INTEL_PENTIUM = 0x024A,
@@ -1303,7 +1305,8 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
SPOOLSS_DRIVER_VERSION_9X = 0,
SPOOLSS_DRIVER_VERSION_NT35 = 1,
SPOOLSS_DRIVER_VERSION_NT4 = 2,
- SPOOLSS_DRIVER_VERSION_200X = 3
+ SPOOLSS_DRIVER_VERSION_200X = 3,
+ SPOOLSS_DRIVER_VERSION_2012 = 4
} spoolss_DriverOSVersion;
typedef struct {
@@ -1816,6 +1819,7 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
const string SPL_ARCH_W32PPC= W32PPC;
const string SPL_ARCH_IA64 = IA64;
const string SPL_ARCH_X64 = x64;
+ const string SPL_ARCH_ARM = ARM;
const string SPOOLSS_ARCHITECTURE_ALL = All;
const string SPOOLSS_ARCHITECTURE_ALL_CLUSTER = AllCluster;
@@ -1823,6 +1827,7 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
const string SPOOLSS_ARCHITECTURE_IA_64 = Windows
IA64;
const string SPOOLSS_ARCHITECTURE_x64 = Windows x64;
const string SPOOLSS_ARCHITECTURE_4_0 = Windows 4.0;
+ const string SPOOLSS_ARCHITECTURE_ARM = Windows ARM;
const string SPOOLSS_DEFAULT_SERVER_PATH=
C:\\WINDOWS\\system32\\spool;
typedef [public,gensize] struct {
@@ -3202,4 +3207,24 @@ cpp_quote(#define spoolss_security_descriptor
security_descriptor)
/* Function: 0x6d */
[todo] WERROR spoolss_6d(
);
+
+ /**/
+ /* Function: 0x6e */
+ [todo] WERROR spoolss_RpcGetJobNamedPropertyValue(
+ );
+
+ /**/
+ /* Function: 0x6f */
+ [todo] WERROR spoolss_RpcSetJobNamedProperty(
+ );
+
+ /**/
+ /* Function: 0x70 */
+ [todo] WERROR spoolss_RpcDeleteJobNamedProperty(
+ );
+
+ /**/
+ /* Function: 0x71 */
+ [todo] WERROR spoolss_RpcEnumJobNamedProperties(
+ );
}
diff
[SCM] CTDB repository - branch master updated - ctdb-2.0-43-g3cc596d
The branch, master has been updated via 3cc596d2b459d834f9785b3a98027e46431ff2b9 (commit) via 6a1d88a17321f7e1dc84b4823d5e7588516a6904 (commit) via 8adb255e62dbe60d1e983047acd7b9c941231d11 (commit) via f6ce18d011dd9043b04256690d826deb2640cd89 (commit) via c09aeaecad7d3232b1c07bab826b96818756f5e0 (commit) via 4dc08e37dec464c8785a2ddae15c7c69d3c81ac3 (commit) via 4c87e7cb3fa2cf2e034fa8454364e0a7fe0c8f81 (commit) via e06476e07197b7327b8bdac9c0b2e7281798ffec (commit) via bcd5f587aff3ba536cb0b5ef00d2d802352bae25 (commit) via edda58a45915494027785608126b5da7c98fee85 (commit) via 5c820b2398a42af0e94bc524854a1ad144a63f7b (commit) via 98bd58a98d34ecca89c9042417d7527a18a5ecf9 (commit) via d357d52dbd533444a4af6151d04ba119a1533068 (commit) via 20631f5f29859920844dd8f410e24917aabd3dfd (commit) via 06ad6b8a19f830472b0ed65cb52e7c3ea74ed1dc (commit) from 1a5410e8349cdb96fdc51aa5ecd4f5734f6798a5 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 3cc596d2b459d834f9785b3a98027e46431ff2b9 Author: Martin Schwenke mar...@meltin.net Date: Tue Jan 8 10:21:49 2013 +1100 tests/eventscripts: Ratchet down debug level for ctdb_takeover_tests The default IP allocation algorithm used by ctdb_takeover_tests changed from non-deterministic IPs to LCP2. The latter generates a lot more debug output. ctdb_takeover_tests is used by the ctdb tool stub to calculate IP address changes for failovers. This resulted in unexpected debug output that caused tests to fail. Since eventscript tests don't care how IP allocations are arrived at, the best solution is to turn down the debug level. Signed-off-by: Martin Schwenke mar...@meltin.net commit 6a1d88a17321f7e1dc84b4823d5e7588516a6904 Author: Martin Schwenke mar...@meltin.net Date: Fri Dec 14 17:12:01 2012 +1100 recoverd: Separate each IP allocation algorithm into its own function This makes the code much more readable and maintainable. As a side effect, fix a memory leak in LCP2. Signed-off-by: Martin Schwenke mar...@meltin.net commit 8adb255e62dbe60d1e983047acd7b9c941231d11 Author: Martin Schwenke mar...@meltin.net Date: Thu Dec 13 13:23:32 2012 +1100 recoverd: New function unassign_unsuitable_ips() Move the code into a new function so it can be called from a number of places. Signed-off-by: Martin Schwenke mar...@meltin.net commit f6ce18d011dd9043b04256690d826deb2640cd89 Author: Martin Schwenke mar...@meltin.net Date: Thu Dec 13 12:15:32 2012 +1100 recoverd: Move failback retry loop into basic_failback() and lcp2_failback() The retry loop is currently in ctdb_takeover_run_core(). Pushing it into each function will make it possible to put each algorithm into a separate top-level function. This will make the code much clearer and more maintainable. Also keep associated test code compatible. Signed-off-by: Martin Schwenke mar...@meltin.net commit c09aeaecad7d3232b1c07bab826b96818756f5e0 Author: Martin Schwenke mar...@meltin.net Date: Tue Dec 11 15:49:17 2012 +1100 recoverd: Trying to failback more IPs no longer allocates unassigned IPs Neither basic_failback() nor lcp2_failback() unassign IPs anymore, so there's no point looping back that far. Also fix a unit test that now fails because looping back to handle unassigned IPs is no longer logged. Signed-off-by: Martin Schwenke mar...@meltin.net commit 4dc08e37dec464c8785a2ddae15c7c69d3c81ac3 Author: Martin Schwenke mar...@meltin.net Date: Tue Dec 11 15:43:36 2012 +1100 recoverd: basic_failback() can call find_takeover_node() directly Instead of unassigning, looping back and depending on basic_allocate_unassigned. Signed-off-by: Martin Schwenke mar...@meltin.net commit 4c87e7cb3fa2cf2e034fa8454364e0a7fe0c8f81 Author: Martin Schwenke mar...@meltin.net Date: Tue Dec 11 15:01:12 2012 +1100 recoverd: Don't do failback at all when deterministic IPs are in use This seems to be the right thing to do instead of calling into the failback code and continually skipping the release of an IP. Signed-off-by: Martin Schwenke mar...@meltin.net commit e06476e07197b7327b8bdac9c0b2e7281798ffec Author: Martin Schwenke mar...@meltin.net Date: Fri Dec 14 17:10:41 2012 +1100 recoverd: Move the test for both 'DeterministicIPs' and 'NoIPFailback' set If this is done earlier then some other logic can be improved. Also, this should be a warning since no error condition is set. Signed-off-by: Martin Schwenke mar...@meltin.net commit bcd5f587aff3ba536cb0b5ef00d2d802352bae25 Author: Martin Schwenke mar...@meltin.net Date: Fri Dec 14 17:10:05 2012 +1100
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via eae01b0 samba-tool Add --service argument to samba-tool ntacl get/set via cef5f46 pysmbd: Change to keyword based arguments via 4741cda scripting-provision: Set sysvol ACLs on the sysvol share via 0533905 scripting-ntacls: Optionally allow the service to be specified. via 813a3f0 pysmbd: Convert pysmbd to take an optional service to connect to via 5a3e915 smbd: Fix calls to create_conn_struct_cwd to be correctly indented. via 6c80cf7 smbd: Split create_conn_struct into a fn that does not change the working dir from 6a5afa2 spoolss: add stubs for new JobNamedProperty dcerpc calls. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit eae01b0d3daf5bae9edada73669e3af879b000bb Author: Andrew Bartlett abart...@samba.org Date: Sat Dec 15 21:24:26 2012 +1100 samba-tool Add --service argument to samba-tool ntacl get/set This also ensures a VFS connect is done to the correct service. Andrew Bartlett Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Tue Jan 8 03:39:21 CET 2013 on sn-devel-104 commit cef5f466af80406d9a1ce0b37d1ed1d237d59be1 Author: Andrew Bartlett abart...@samba.org Date: Sat Dec 15 21:17:30 2012 +1100 pysmbd: Change to keyword based arguments Reviewed-by: Jeremy Allison j...@samba.org commit 4741cda95668bee184cd2760848924fa4ad1e2bc Author: Andrew Bartlett abart...@samba.org Date: Fri Dec 14 22:17:23 2012 +1100 scripting-provision: Set sysvol ACLs on the sysvol share This allows us to correctly load any modules that have been specified by the smb.conf for [sysvol] and issue a VFS connect operation which may be required by some VFS modules. Andrew Bartlett Reviewed-by: Jeremy Allison j...@samba.org commit 0533905c5df2c0de4f2714df3e29ad90b48b1892 Author: Andrew Bartlett abart...@samba.org Date: Fri Dec 14 22:09:18 2012 +1100 scripting-ntacls: Optionally allow the service to be specified. Providing a service allows a VFS connect to be issued on the correct service, and so ensures that the correct modules are loaded rather than just what is specified in [globals]. Andrew Bartlett Reviewed-by: Jeremy Allison j...@samba.org commit 813a3f0df91251dd7f920074ff8cd2b45bf48749 Author: Andrew Bartlett abart...@samba.org Date: Wed Oct 10 13:48:27 2012 +1100 pysmbd: Convert pysmbd to take an optional service to connect to This uses create_conn_struct to correctly call VFS_CONNECT(), but only if a service has been specified. Andrew Bartlett Reviewed-by: Jeremy Allison j...@samba.org commit 5a3e915d20bb11984c42081bf25ce09baa58e04e Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 8 09:29:48 2013 +1100 smbd: Fix calls to create_conn_struct_cwd to be correctly indented. These are whitespace changes only, left out of the previous commit to preserve clarity. Andrew Bartlett. Reviewed-by: Jeremy Allison j...@samba.org commit 6c80cf747d75e648a1d88d477bcf476e6874c4b3 Author: Andrew Bartlett abart...@samba.org Date: Wed Oct 10 13:47:49 2012 +1100 smbd: Split create_conn_struct into a fn that does not change the working dir The python bindings do not want the current working directory changed during operations, so we provide two functions, one providing the original behaviour, and other providing the python bindings with just the memory allocation and initilisation stuff. Andrew Bartlett Reviewed-by: Jeremy Allison j...@samba.org --- Summary of changes: source3/printing/nt_printing.c | 42 ++-- source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 24 +- source3/smbd/msdfs.c | 90 -- source3/smbd/proto.h | 16 +- source3/smbd/pysmbd.c | 333 +++- source4/scripting/python/samba/netcmd/ntacl.py | 16 +- source4/scripting/python/samba/ntacls.py | 12 +- .../scripting/python/samba/provision/__init__.py | 37 ++- 8 files changed, 336 insertions(+), 234 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 252fbb8..e09ee89 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -616,13 +616,13 @@ static uint32 get_correct_cversion(struct auth_session_info *session_info, return -1; } - nt_status = create_conn_struct(talloc_tos(), - server_event_context(), -
[SCM] CTDB repository - branch master updated - ctdb-2.0-44-g13a5944
The branch, master has been updated
via 13a5944f8a27d43006acfffba76958693cae7702 (commit)
from 3cc596d2b459d834f9785b3a98027e46431ff2b9 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 13a5944f8a27d43006acfffba76958693cae7702
Author: Martin Schwenke mar...@meltin.net
Date: Fri Oct 12 16:12:38 2012 +1100
tests/simple: Add test to check recovery daemon IP verification
Also update ips_are_on_nodeglob() to handle negation.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
tests/scripts/integration.bash | 24 ++--
tests/simple/60_recoverd_missing_ip.sh | 103
2 files changed, 121 insertions(+), 6 deletions(-)
create mode 100755 tests/simple/60_recoverd_missing_ip.sh
Changeset truncated at 500 lines:
diff --git a/tests/scripts/integration.bash b/tests/scripts/integration.bash
index 07e764e..2e5fb37 100644
--- a/tests/scripts/integration.bash
+++ b/tests/scripts/integration.bash
@@ -438,8 +438,14 @@ wait_until_node_has_status ()
# Useful for superficially testing IP failover.
# IPs must be on nodes matching nodeglob.
+# If the first argument is '!' then the IPs must not be on nodes
+# matching nodeglob.
ips_are_on_nodeglob ()
{
+local negating=false
+if [ $1 = ! ] ; then
+ negating=true ; shift
+fi
local nodeglob=$1 ; shift
local ips=$*
@@ -447,17 +453,23 @@ ips_are_on_nodeglob ()
all_ips_on_node 1
-while read ip pnn ; do
- for check in $ips ; do
+for check in $ips ; do
+ while read ip pnn ; do
if [ $check = $ip ] ; then
case $pnn in
- ($nodeglob) : ;;
- (*) return 1 ;;
+ ($nodeglob) if $negating ; then return 1 ; fi ;;
+ (*) if ! $negating ; then return 1 ; fi ;;
esac
ips=${ips/${ip}} # Remove from list
+ break
fi
- done
-done $out # bashism to avoid problem setting variable in pipeline.
+ # If we're negating and we didn't see the address then it
+ # isn't hosted by anyone!
+ if $negating ; then
+ ips=${ips/${check}}
+ fi
+ done $out # bashism to avoid problem setting variable in pipeline.
+done
ips=${ips// } # Remove any spaces.
[ -z $ips ]
diff --git a/tests/simple/60_recoverd_missing_ip.sh
b/tests/simple/60_recoverd_missing_ip.sh
new file mode 100755
index 000..fc12e4c
--- /dev/null
+++ b/tests/simple/60_recoverd_missing_ip.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+test_info()
+{
+cat EOF
+Verify that the reconvery daemon handles unhosted IPs properly.
+EOF
+}
+
+. ${TEST_SCRIPTS_DIR}/integration.bash
+
+ctdb_test_init $@
+
+set -e
+
+cluster_is_healthy
+
+# Reset configuration
+ctdb_restart_when_done
+
+select_test_node_and_ips
+
+echo Running test against node $test_node and IP $test_ip
+
+# Find the interface
+try_command_on_node $test_node $CTDB ip -v -Y | awk -F: -v ip=$test_ip '\$2
== ip { print \$4 }'
+iface=$out
+
+if [ -z $TEST_LOCAL_DAEMONS ] ; then
+# Find the netmask
+try_command_on_node $test_node ip addr show to $test_ip
+mask=${out##*/}
+mask=${mask%% *}
+else
+mask=24
+fi
+
+echo $test_ip/$mask is on $iface
+
+echo Deleting IP $test_ip from all nodes
+try_command_on_node -v $test_node $CTDB delip -n all $test_ip
+
+wait_until_ips_are_on_nodeglob '!' $test_node $test_ip
+
+try_command_on_node -v all $CTDB ip
+
+my_exit_hook ()
+{
+if [ -z $TEST_LOCAL_DAEMONS ] ; then
+ onnode -q all $CTDB enablescript 10.interface
+fi
+}
+
+ctdb_test_exit_hook_add my_exit_hook
+
+if [ -z $TEST_LOCAL_DAEMONS ] ; then
+# Stop monitor events from bringing up the link status of an interface
+try_command_on_node $test_node $CTDB disablescript 10.interface
+fi
+
+# This effectively cancels any monitor event that is in progress and
+# runs a new one
+try_command_on_node $test_node $CTDB eventscript monitor
+
+echo Marking interface $iface down on node $test_node
+try_command_on_node $test_node $CTDB setifacelink $iface down
+
+try_command_on_node $test_node $CTDB clearlog recoverd
+
+echo Adding IP $test_ip to node $test_node
+try_command_on_node $test_node $CTDB addip $test_ip/$mask $iface
+
+# Give the recovery daemon enough time to start doing IP verification
+sleep_for 15
+
+try_command_on_node $test_node $CTDB getlog recoverd
+
+msg=Public IP '$test_ip' is not assigned and we could serve it
+
+echo $msg
+
+if grep $msg $out ; then
+echo BAD: the recovery daemon noticed that the IP was unhosted
+exit 1
+else
+echo GOOD: the recovery daemon did not notice that the IP was unhosted
+fi
+
+try_command_on_node $test_node $CTDB clearlog recoverd
+
+echo Marking interface
[SCM] CTDB repository - branch master updated - ctdb-2.0-52-g50abf59
The branch, master has been updated via 50abf597cefe6f8ea2a2ff7694bf84641344a9b1 (commit) via e2aaa64925cca359c71520e01a18fc9461b0da4d (commit) via 03356fd5ae7a3ac35fde0289cbea7c71ecf07367 (commit) via 13e5e609b262847b607e7af7e0685f44e7cb8e36 (commit) via 8507303b525d20c74e8ec4e7c4f5f275945cd3b6 (commit) via 376015ba5ad6b7703ae9949a1d40a0c72dfaba0c (commit) via 740ea8ea5084149c8b552a01ee1c98c558b12384 (commit) via b23c30253cc9eb274b895cac0f8c65245ba0a200 (commit) from 13a5944f8a27d43006acfffba76958693cae7702 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 50abf597cefe6f8ea2a2ff7694bf84641344a9b1 Author: Martin Schwenke mar...@meltin.net Date: Fri Jan 4 13:52:01 2013 +1100 scripts: Make script_log() use supplied message, stop logger from hanging When using syslog any provided message arguments are ignored and not passed to logger. This means that logger blocks waiting on stdin. That's bad. Signed-off-by: Martin Schwenke mar...@meltin.net commit e2aaa64925cca359c71520e01a18fc9461b0da4d Author: Martin Schwenke mar...@meltin.net Date: Fri Jan 4 11:41:03 2013 +1100 scripts: Rework ctdb-crash-cleanup.sh so that it uses existing functions This improves maintainability. Signed-off-by: Martin Schwenke mar...@meltin.net commit 03356fd5ae7a3ac35fde0289cbea7c71ecf07367 Author: Martin Schwenke mar...@meltin.net Date: Fri Jan 4 11:23:29 2013 +1100 scripts: Make drop_all_public_ips() more robust Incorporate some of the logic from ctdb-crash-cleanup.sh that ensures IPs are deleted even if they have the wrong netmask or are on the wrong interface. Factoring out some of the code will allow it to be used elsewhere. Signed-off-by: Martin Schwenke mar...@meltin.net commit 13e5e609b262847b607e7af7e0685f44e7cb8e36 Author: Martin Schwenke mar...@meltin.net Date: Thu Jan 3 16:02:52 2013 +1100 ctdbd: Default value for debug_hung_script should use ETCDIR That is, it should use whatever was specified in ./configure and should not hardcode /etc. Signed-off-by: Martin Schwenke mar...@meltin.net commit 8507303b525d20c74e8ec4e7c4f5f275945cd3b6 Author: Martin Schwenke mar...@meltin.net Date: Thu Jan 3 15:33:57 2013 +1100 scripts: debug-hung-script.sh doesn't need functions/loadconfig Signed-off-by: Martin Schwenke mar...@meltin.net commit 376015ba5ad6b7703ae9949a1d40a0c72dfaba0c Author: Martin Schwenke mar...@meltin.net Date: Thu Jan 3 15:33:10 2013 +1100 scripts: statd-callout should calculate CTDB_BASE if it is not set Signed-off-by: Martin Schwenke mar...@meltin.net commit 740ea8ea5084149c8b552a01ee1c98c558b12384 Author: Martin Schwenke mar...@meltin.net Date: Thu Jan 3 15:26:12 2013 +1100 eventscripts: Each script should set CTDB_BASE if it is not set This makes it easier to run the scripts externally. Signed-off-by: Martin Schwenke mar...@meltin.net commit b23c30253cc9eb274b895cac0f8c65245ba0a200 Author: Martin Schwenke mar...@meltin.net Date: Thu Jan 3 15:07:07 2013 +1100 scripts: Move drop_all_public_ips() to the functions file ... so it can be improved and used elsewhere. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: config/ctdb-crash-cleanup.sh | 49 + config/ctdb.init |6 config/debug-hung-script.sh |3 -- config/events.d/00.ctdb |3 ++ config/events.d/01.reclock|3 ++ config/events.d/10.interface |3 ++ config/events.d/11.natgw |3 ++ config/events.d/11.routing|3 ++ config/events.d/13.per_ip_routing |3 ++ config/events.d/20.multipathd |3 ++ config/events.d/31.clamd |3 ++ config/events.d/40.fs_use |3 ++ config/events.d/40.vsftpd |3 ++ config/events.d/41.httpd |3 ++ config/events.d/49.winbind|3 ++ config/events.d/50.samba |3 ++ config/events.d/60.ganesha|3 ++ config/events.d/60.nfs|3 ++ config/events.d/62.cnfs |3 ++ config/events.d/70.iscsi |3 ++ config/events.d/91.lvs|3 ++ config/events.d/99.timeout|3 ++ config/functions | 37 +++- config/statd-callout |5 +-- server/ctdbd.c|2 +- 25 files changed, 113 insertions(+), 46 deletions(-) Changeset truncated at 500 lines: diff --git a/config/ctdb-crash-cleanup.sh b/config/ctdb-crash-cleanup.sh index e176518..f426056 100755 --- a/config/ctdb-crash-cleanup.sh +++ b/config/ctdb-crash-cleanup.sh @@ -4,41
