[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 0fa3d75 WHATSNEW: Update changes since RC5.
via db6a76a BUG 9436: Fix leaking sockets of SMB connections to a DC.
via b0595ad Fix MD5 detection in the autoconf build
via 1036f3d Fix Bug 9422 - large read requests cause server to issue
malformed reply
via 08db481 docs: Rename man ntlm_auth.
from 9872a73 docs: Add some binaries to the SEE ALSO section
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 0fa3d75268b402d05bc23f950888f529e84ea5f4
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 29 09:05:42 2012 +0100
WHATSNEW: Update changes since RC5.
Karolin
Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Thu Nov 29 10:43:41 CET 2012 on sn-devel-104
commit db6a76ab241893a08ed06930a68c122bac2defc1
Author: Andreas Schneider a...@samba.org
Date: Wed Nov 28 12:53:39 2012 +0100
BUG 9436: Fix leaking sockets of SMB connections to a DC.
As this is a burst of 3 unbound sockets with each try to reach a DC
we're running out of file descriptors pretty fast. So winbind is then
mostly spinning in an accept loop failing with EMFILE.
Signed-off-by: Andreas Schneider a...@samba.org
commit b0595adc6618c26621c379abdab8247a3327d941
Author: Matthieu Patou m...@matws.net
Date: Wed Nov 21 12:07:42 2012 -0800
Fix MD5 detection in the autoconf build
This is a front port of patches made in 3.6.x branch for bugs:
* 9037
* 9086
* 9094
* 9418
It checks if there is a library for md5 related functions (libmd or
libmd5) and if so it checks for the presence of md5.h headers it also
respect the need for osX build to not use samba's md5 implementation as
it's already present in the system libs.
Signed-off-by: Matthieu Patou m...@matws.net
Reviewed-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Fri Nov 23 10:05:34 CET 2012 on sn-devel-104
(cherry picked from commit 8f4b871e9776245f599a302f569594aaba9d25c9)
commit 1036f3d93311f7521ba2ef56a83d74a0b7ac2e36
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 27 14:58:09 2012 -0800
Fix Bug 9422 - large read requests cause server to issue malformed reply
Reviewed by: Jeremy Allison j...@samba.org
commit 08db4810ca1000248ff54595b851bb8cbfafc2d0
Author: Karolin Seeger ksee...@samba.org
Date: Wed Nov 28 12:46:31 2012 +0100
docs: Rename man ntlm_auth.
Rename man ntlm_auth to ntlm_auth4.
Karolin
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Wed Nov 28 20:41:48 CET 2012 on sn-devel-104
(cherry picked from commit 941bb9bb6dfd1c2dfd01696b2169e0782158ad6d)
---
Summary of changes:
WHATSNEW.txt |9 +++
libcli/smb/smb_seal.c |2 +-
source3/configure.in | 41 +--
source3/smbd/process.c |2 +-
source3/winbindd/winbindd_cm.c |4 +
.../man/{ntlm_auth.1.xml = ntlm_auth4.1.xml} | 74 ++--
source4/utils/wscript_build|2 +-
7 files changed, 87 insertions(+), 47 deletions(-)
rename source4/utils/man/{ntlm_auth.1.xml = ntlm_auth4.1.xml} (80%)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index eb22e7e..5313ffe 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -196,6 +196,10 @@ o Amitay Isaacs ami...@gmail.com
* BUG 9354: Fix format string vulnerability in an error message.
+o Volker Lendecke v...@samba.org
+* BUG 9422: Large read requests cause server to issue malformed reply.
+
+
o Stefan Metzmacher me...@samba.org
* BUG 9373: samba-tool: Report a CommandError if loading of the config file
fails.
@@ -204,6 +208,10 @@ o Stefan Metzmacher me...@samba.org
* BUG 9402: lib/addns: Fix working with a bind9 server.
+o Matthieu Patou m...@matws.net
+* BUG 9418: Fix MD5 detection in the autoconf build.
+
+
o Arvid Requate requ...@univention.de
* BUG 9376: Fix typo in got_duplicate_group check.
* BUG 9392: Fix 'samba-tool fsmo --role=schema'.
@@ -211,6 +219,7 @@ o Arvid Requate requ...@univention.de
o Andreas Schneider a...@samba.org
* BUG 9386: Failover if netlogon pipe is not available.
+* BUG 9436: Fix leaking sockets of SMB connections to a DC.
o Karolin Seeger ksee...@samba.org
diff --git a/libcli/smb/smb_seal.c b/libcli/smb/smb_seal.c
index 78af733..f4f804c 100644
--- a/libcli/smb/smb_seal.c
+++ b/libcli/smb/smb_seal.c
@@ -56,7 +56,7
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2e12dee spoolss: fix segfault when default devmode is disabled
from 941bb9b docs: Rename man ntlm_auth.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2e12deedcfdc5ce3637a125b083b0f00b208bf61
Author: David Disseldorp dd...@samba.org
Date: Tue Nov 27 16:10:28 2012 +0100
spoolss: fix segfault when default devmode is disabled
Currently when default devmode is explicitly disabled, and a printer
is added with a null device mode, spoolssd crashes in copy_devicemode().
Both construct_printer_info2() and construct_printer_info8() code paths
currently unconditionally attempt to copy a printers device mode,
without checking whether one is present.
This change fixes this regression such that construct_printer_info*()
functions check for a null device mode before copying.
https://bugzilla.samba.org/show_bug.cgi?id=9433
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Thu Nov 29 13:03:05 CET 2012 on sn-devel-104
---
Summary of changes:
source3/rpc_server/spoolss/srv_spoolss_nt.c | 52 +-
1 files changed, 34 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index ff342de..b8ee9f4 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1938,24 +1938,12 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
* save it here in case we get a job submission on this handle
*/
-if ((Printer-printer_type != SPLHND_SERVER)
-r-in.devmode_ctr.devmode) {
+if ((Printer-printer_type != SPLHND_SERVER)
+ (r-in.devmode_ctr.devmode != NULL)) {
copy_devicemode(NULL, r-in.devmode_ctr.devmode,
Printer-devmode);
}
-#if 0 /* JERRY -- I'm doubtful this is really effective */
- /* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN
- optimization in Windows 2000 clients --jerry */
-
- if ( (r-in.access_mask == PRINTER_ACCESS_ADMINISTER)
-(RA_WIN2K == get_remote_arch()) )
- {
- DEBUG(10,(_spoolss_OpenPrinterEx: Enabling LAN/WAN hack for
Win2k clients.\n));
- usleep( 50 );
- }
-#endif
-
return WERR_OK;
}
@@ -4030,8 +4018,22 @@ static WERROR construct_printer_info2(TALLOC_CTX
*mem_ctx,
r-cjobs= count;
r-averageppm = info2-averageppm;
- copy_devicemode(mem_ctx, info2-devmode, r-devmode);
- if (!r-devmode) {
+ if (info2-devmode != NULL) {
+ result = copy_devicemode(mem_ctx,
+info2-devmode,
+r-devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else if (lp_default_devmode(snum)) {
+ result = spoolss_create_default_devmode(mem_ctx,
+ info2-printername,
+ r-devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else {
+ r-devmode = NULL;
DEBUG(8,(Returning NULL Devicemode!\n));
}
@@ -4201,8 +4203,22 @@ static WERROR construct_printer_info8(TALLOC_CTX
*mem_ctx,
return result;
}
- copy_devicemode(mem_ctx, info2-devmode, r-devmode);
- if (!r-devmode) {
+ if (info2-devmode != NULL) {
+ result = copy_devicemode(mem_ctx,
+info2-devmode,
+r-devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else if (lp_default_devmode(snum)) {
+ result = spoolss_create_default_devmode(mem_ctx,
+ info2-printername,
+ r-devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else {
+ r-devmode = NULL;
DEBUG(8,(Returning NULL Devicemode!\n));
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 26a0ee5 docs: man oLschema2ldif: Add missing meta data. via e9e9661 docs: man ntlm_auth4: Add missing meta data. via 6ba7a66 docs: man smbtorture: Add missing meta data. via 122cc5b docs: man masktest: Add missing meta data. via cb501f9 docs: man locktest: Add missing meta data. via bd3ad42 docs: man gentest: Add missing meta data. via 7b6186c docs: man 8 samba: Add missing meta data. via c867079 docs: man regtree: Add missing meta data. via 53b9e4b docs: man regshell: Add missing meta data. via 9678fca docs: man regpatch: Add missing meta data. via 1ad0912 docs: man regdiff: Add missing meta data. via 83fdfe3 docs: man ndrdump: Add missing meta data. via 68c6dcb docs: man tdbtool: Add missing meta data. via 174ab35 docs: man talloc: Add missing meta data. via 0162dd5 docs: man ldbsearch: Add missing meta data. via 787a58b docs: man ldbrename: Add missing meta data. via 1404a24 docs: man ldbmodify: Add missing meta data. via 0b900da docs: man ldbedit: Add missing meta data. via 1d5ef89 docs: man ldbdel: Add missing meta data. via 08e6305 docs: man ldbadd: Add missing meta data. via ac4881b docs: man ldb.3: Add missing meta data. via e19da78 s3-printing: add missing carriage return to debug str via 21bd278 rpcclient: fix usage docs for rpcclient adddriver via 27d23dd selftest: configure printer with default devmode = no from 2e12dee spoolss: fix segfault when default devmode is disabled http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 26a0ee5a0d915961067050564197a3d44b22d1e3 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:15:49 2012 +0100 docs: man oLschema2ldif: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org Autobuild-User(master): Andreas Schneider a...@cryptomilk.org Autobuild-Date(master): Thu Nov 29 15:27:45 CET 2012 on sn-devel-104 commit e9e9661b23cf8b9da48284bda4e41cd6d98a2050 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:15:07 2012 +0100 docs: man ntlm_auth4: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit 6ba7a6686c1e535343aad7748a2338b1bc4a3a6f Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:14:15 2012 +0100 docs: man smbtorture: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit 122cc5b0230c0f99263ea1f156a34bbcf8b7664d Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:09:07 2012 +0100 docs: man masktest: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit cb501f99d26b638c6bf3ae431a2c31febd54c4f6 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:04:43 2012 +0100 docs: man locktest: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit bd3ad42d07971496b6fd800b752eb0a1b07568e2 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:04:26 2012 +0100 docs: man gentest: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit 7b6186c18848675118b59bb33c2a7e41f60d4eb3 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:03:52 2012 +0100 docs: man 8 samba: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit c86707973dc7b17651187ea59b102859fa6531f2 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:03:19 2012 +0100 docs: man regtree: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage. Karolin Reviewed-by: Andreas Schneider a...@samba.org commit 53b9e4ba6b76cc3282a6bd1be6fa1a98ababca96 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 29 10:02:51 2012 +0100 docs: man regshell: Add missing meta data. This avoids warnings during the waf build and removes FIXME entries from the manpage.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2f38a77 dbwrap: Do not rely on dbwrap_record_get_value to return a talloc object via e271db4 dbwrap: Remove an unnecessary if-statement via c7af12d dbwrap: No need to NULL out a talloc_zero'ed structure element via a022513 dbwrap: Use talloc_zero in db_open_rbt via 0c0815c dbwrap: Use talloc_zero in db_open_cache via 343ce16 s3: Remove db_ctdb_fetch via 6b8a37f s3: Directly parse local existing records in db_ctdb_parse_record via 9dd047d s3: Factor out db_ctdb_can_use_local_hdr from db_ctdb_can_use_local_copy via 55d75a3 s3: Remove unused code for fetching persistent ctdb records via 7b43362 s3: Avoid db_ctdb_fetch for persistent databases via 93219f9 s3: Factor out parse_newest_in_marshall_buffer from pull_newest_from_marshall_buffer via 850d5de s3: reduce db_ctdb_marshall_loop_next to specialized db_ctdb_marshall_buf_parse via a742b6e s3: Factor out db_ctdb_marshall_loop_next_key from db_ctdb_marshall_loop_next via 664b170 s3: Slightly simplify db_ctdb_marshall_loop_next via af608cd s3: Use db_ctdb_ltdb_parse in db_ctdb_fetch_db_seqnum_from_db via 7127344 s3: Use db_ctdb_ltdb_parse in db_ctdb_ltdb_fetch via 560ed93 s3: Add db_ctdb_ltdb_parse via 6e0259d s3: Slightly simplify db_ctdb_transaction_commit via b206b52 s3: Remove header==NULL code from db_ctdb_marshall_record via 24c36e7 s3: test dbwrap_ctdb via 8300791 dbwrap: Use dbwrap_parse_record in dbwrap_fetch_uint32_bystring from 26a0ee5 docs: man oLschema2ldif: Add missing meta data. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2f38a77a2dfc72ccd94f5027807c9484dae54358 Author: Volker Lendecke v...@samba.org Date: Thu Nov 29 16:45:15 2012 +0100 dbwrap: Do not rely on dbwrap_record_get_value to return a talloc object db_tdb_fetch_locked returns the value as part of a larger talloc object that also contains the key. This means we can not realloc, but have to freshly alloc. Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Thu Nov 29 20:21:51 CET 2012 on sn-devel-104 commit e271db4fd82d03b39a5872b1a3fde5e2a16e1633 Author: Volker Lendecke v...@samba.org Date: Thu Nov 29 15:04:33 2012 +0100 dbwrap: Remove an unnecessary if-statement TALLOC_FREE can live with a NULL pointer Reviewed-by: Michael Adam ob...@samba.org commit c7af12dd30f9670806b161b94d91b741d06813e2 Author: Volker Lendecke v...@samba.org Date: Thu Nov 29 15:03:20 2012 +0100 dbwrap: No need to NULL out a talloc_zero'ed structure element Reviewed-by: Michael Adam ob...@samba.org commit a02251333fc185aee176b565a85fd42e9ff4cfbc Author: Volker Lendecke v...@samba.org Date: Thu Nov 29 15:02:43 2012 +0100 dbwrap: Use talloc_zero in db_open_rbt Reviewed-by: Michael Adam ob...@samba.org commit 0c0815cfe3cce09ef7dffa62235967e954915513 Author: Volker Lendecke v...@samba.org Date: Thu Nov 29 15:02:15 2012 +0100 dbwrap: Use talloc_zero in db_open_cache Reviewed-by: Michael Adam ob...@samba.org commit 343ce16e0b52acd3d109eb619f60e394c1e04abb Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 13:42:23 2012 +0100 s3: Remove db_ctdb_fetch Note that this also makes the request for read only copies much more explicity visible in the code. Reviewed-by: Michael Adam ob...@samba.org commit 6b8a37f5ca83c45e2cac262f4d9eee5c7750c283 Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 13:36:48 2012 +0100 s3: Directly parse local existing records in db_ctdb_parse_record Reviewed-by: Michael Adam ob...@samba.org commit 9dd047d67e4b53f1240956e20af986a1d03dce32 Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 13:27:07 2012 +0100 s3: Factor out db_ctdb_can_use_local_hdr from db_ctdb_can_use_local_copy Reviewed-by: Michael Adam ob...@samba.org commit 55d75a3fbe95ea3b95dc83551cca742bcddb6e9b Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 13:06:38 2012 +0100 s3: Remove unused code for fetching persistent ctdb records The only entry point here is parse_record, and this catches the persistent case with a direct parse now Reviewed-by: Michael Adam ob...@samba.org commit 7b43362a9ea942e6759fd9298b2a67cb3328520f Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 13:03:56 2012 +0100 s3: Avoid db_ctdb_fetch for persistent databases Reviewed-by: Michael Adam ob...@samba.org commit 93219f92bb4294f0d7be7ba91f6a2e312336469d Author: Volker Lendecke v...@samba.org Date: Mon Nov 12 12:13:39 2012 +0100 s3: Factor out parse_newest_in_marshall_buffer from pull_newest_from_marshall_buffer
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d5693d9 Fix Bug 9422 - large read requests cause server to issue
malformed reply
from 2f38a77 dbwrap: Do not rely on dbwrap_record_get_value to return a
talloc object
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d5693d99b83c9f10d13f279505139a3bf5591b89
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 27 14:58:09 2012 -0800
Fix Bug 9422 - large read requests cause server to issue malformed reply
Reviewed by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Fri Nov 30 03:27:07 CET 2012 on sn-devel-104
---
Summary of changes:
libcli/smb/smb_seal.c |2 +-
source3/smbd/process.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb_seal.c b/libcli/smb/smb_seal.c
index 78af733..f4f804c 100644
--- a/libcli/smb/smb_seal.c
+++ b/libcli/smb/smb_seal.c
@@ -56,7 +56,7 @@ NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t
*p_enc_ctx_num)
static void smb_set_enclen(char *buf,int len,uint16_t enc_ctx_num)
{
- _smb_setlen_nbt(buf,len);
+ _smb_setlen_tcp(buf,len);
SCVAL(buf,4,0xFF);
SCVAL(buf,5,'E');
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index fd2c6a4..eeda6f9 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -170,7 +170,7 @@ bool srv_send_smb(struct smbd_server_connection *sconn,
char *buffer,
}
}
- len = smb_len(buf_out) + 4;
+ len = smb_len_large(buf_out) + 4;
ret = write_data(sconn-sock, buf_out+nwritten, len - nwritten);
if (ret = 0) {
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.0-15-gf81e9ad
The branch, master has been updated
via f81e9add466b1d9b2796c09c6ba63b77296ea149 (commit)
from 905cd1293aa97dc7839a59b4f68eca02981f0891 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit f81e9add466b1d9b2796c09c6ba63b77296ea149
Author: Amitay Isaacs ami...@gmail.com
Date: Fri Nov 30 12:21:30 2012 +1100
daemon: Check if log_latency_ms is set before using it
This fixes a bug where wrong variable is checked.
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
include/ctdb_private.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index f06a1f1..348df09 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -376,7 +376,7 @@ struct ctdb_daemon_data {
ctdb_db-statistics.counter.total += value;
\
ctdb_db-statistics.counter.num++;
\
\
- if (ctdb_db-ctdb-tunable.reclock_latency_ms != 0) {
\
+ if (ctdb_db-ctdb-tunable.log_latency_ms != 0) {
\
if (value*1000 ctdb_db-ctdb-tunable.log_latency_ms)
{ \
DEBUG(DEBUG_ERR,
\
(High latency %.6fs for operation %s on
database %s\n,\
--
CTDB repository
[SCM] CTDB repository - branch 1.2.39 updated - ctdb-1.9.1-506-g12c9737
The branch, 1.2.39 has been updated
via 12c9737e00f548599ea88b644b625be72466bb8b (commit)
via dbf5e73e54a1df613707837959d33a72a6c3118b (commit)
via a630c2f4e201e1b17d5873e8a45231f92b019278 (commit)
from 0491fdec7b11b0e79750c92977c6cc776d5f88bf (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.39
- Log -
commit 12c9737e00f548599ea88b644b625be72466bb8b
Author: Amitay Isaacs ami...@gmail.com
Date: Fri Nov 30 14:16:21 2012 +1100
New version 1.2.39-7
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit dbf5e73e54a1df613707837959d33a72a6c3118b
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Oct 23 16:23:12 2012 +1100
recoverd: Track the nodes that fail takeover run and set culprit count
If any of the nodes fail takeover run (either due to timeout or failure
to complete within takeover_timeout interval) from main loop, recovery
master will give up trying takeover run with following message:
Unable to setup public takeover addresses. Try again later
And as a side-effect the monitoring is disabled on all the nodes. Before
ctdb_takeover_run() is called from main loop, monitoring get disabled via
startrecovery event. Since ctdb_takeover_run() fails, it never runs
recovered event and monitoring does not get re-enabled.
In main_loop, ctdb_takeover_run() is called with a takeover_fail_callback.
This callback will get called if any of the nodes fail in handling
takeip/releaseip/ipreallocated events in ctdb_takeover_run().
Signed-off-by: Amitay Isaacs ami...@gmail.com
Cherry-pick-from: cbe68821180e04988edf186dcf6d042edcab81de
Conflicts:
server/ctdb_recoverd.c
commit a630c2f4e201e1b17d5873e8a45231f92b019278
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Oct 23 15:06:33 2012 +1100
daemon: Do not ignore timed out monitor events
If an eventscript times out for monitor event, it is considered successful
and the remaining eventscripts are not run. This can make a node prematurely
healthy, cause healthy node to fail over IPs to this node and this node will
not be able to host those IPs. Thus causing loss of access and in case of
NAT-GW
configuration, loss of a default route.
Cherry-pick-from: 5205d545e8d8c72d73b9d5fd148df6de30392fc8
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
include/ctdb_private.h |6 +++---
packaging/RPM/ctdb.spec.in |5 -
server/ctdb_recoverd.c | 32
server/ctdb_takeover.c | 14 +++---
server/ctdb_tunables.c |2 +-
server/eventscript.c |1 -
6 files changed, 47 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index e3a9a15..32e8c68 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1118,6 +1118,8 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
const ctdb_sock_addr *src,
uint32_t seq, uint32_t ack, int rst);
+typedef void (*client_async_callback)(struct ctdb_context *ctdb, uint32_t
node_pnn, int32_t res, TDB_DATA outdata, void *callback_data);
+
int ctdb_set_public_addresses(struct ctdb_context *ctdb, const char *alist);
int ctdb_set_single_public_ip(struct ctdb_context *ctdb,
const char *iface,
@@ -1125,7 +1127,7 @@ int ctdb_set_single_public_ip(struct ctdb_context *ctdb,
int ctdb_set_event_script(struct ctdb_context *ctdb, const char *script);
int ctdb_set_event_script_dir(struct ctdb_context *ctdb, const char
*script_dir);
int ctdb_set_notification_script(struct ctdb_context *ctdb, const char
*script);
-int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map
*nodemap);
+int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map
*nodemap, client_async_callback fail_callback, void *callback_data);
int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
TDB_DATA indata);
@@ -1264,8 +1266,6 @@ int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb);
int ctdb_set_child_logging(struct ctdb_context *ctdb);
void ctdb_lockdown_memory(struct ctdb_context *ctdb);
-typedef void (*client_async_callback)(struct ctdb_context *ctdb, uint32_t
node_pnn, int32_t res, TDB_DATA outdata, void *callback_data);
-
struct client_async_data {
enum ctdb_controls opcode;
bool dont_log_errors;
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 12a9e0b..5165c5c 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -4,7 +4,7 @@ Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Version: 1.2.39
-Release:
