[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ad6ee94... s3: Make debug hires timestamp default to true from a355365... s4:dsdb Fix up after the MAP_ constants became LDB_MAP_ http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ad6ee94950c0977463194b64faee9b012049bfd0 Author: Volker Lendecke v...@samba.org Date: Mon Nov 2 10:05:38 2009 +0100 s3: Make debug hires timestamp default to true It does not cost much and can help a lot when debugging --- Summary of changes: .../smbdotconf/logging/debughirestimestamp.xml |2 +- source3/param/loadparm.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml index 6f32bd5..6cc7b71 100644 --- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml +++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml @@ -14,5 +14,5 @@ /para /description -value type=defaultno/value +value type=defaultyes/value /samba:parameter diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 049b5e9..93be017 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4984,7 +4984,7 @@ static void init_globals(bool first_time_only) Globals.bTimestampLogs = True; string_set(Globals.szLogLevel, 0); Globals.bDebugPrefixTimestamp = False; - Globals.bDebugHiresTimestamp = False; + Globals.bDebugHiresTimestamp = true; Globals.bDebugPid = False; Globals.bDebugUid = False; Globals.bDebugClass = False; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via cb1b5f9... s3: Make debug hires timestamp default to true from 54af185... s3:ldap: don't search when no values where found http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit cb1b5f93332839eb8fc048895c9c9539f775d9a8 Author: Volker Lendecke v...@samba.org Date: Mon Nov 2 10:05:38 2009 +0100 s3: Make debug hires timestamp default to true It does not cost much and can help a lot when debugging --- Summary of changes: .../smbdotconf/logging/debughirestimestamp.xml |2 +- source3/param/loadparm.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml index 6f32bd5..6cc7b71 100644 --- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml +++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml @@ -14,5 +14,5 @@ /para /description -value type=defaultno/value +value type=defaultyes/value /samba:parameter diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 049b5e9..93be017 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4984,7 +4984,7 @@ static void init_globals(bool first_time_only) Globals.bTimestampLogs = True; string_set(Globals.szLogLevel, 0); Globals.bDebugPrefixTimestamp = False; - Globals.bDebugHiresTimestamp = False; + Globals.bDebugHiresTimestamp = true; Globals.bDebugPid = False; Globals.bDebugUid = False; Globals.bDebugClass = False; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via efbca60... WHATSNEW: Update release notes. from cb1b5f9... s3: Make debug hires timestamp default to true http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit efbca60e6d3258da997d11fdb126251c89678a01 Author: Karolin Seeger ksee...@samba.org Date: Mon Nov 2 12:45:53 2009 +0100 WHATSNEW: Update release notes. Karolin --- Summary of changes: WHATSNEW.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 6f4b159..683b8ef 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -22,6 +22,7 @@ smb.conf changes -- --- --- create krb5 conf New yes + debug hires timestamp Changed Default yes ldap follow referral New auto store create time New no -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f35a1b9... s3-gencache: restore gencache_get behavior with NULL
args (with torture test).
from ad6ee94... s3: Make debug hires timestamp default to true
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f35a1b95aa6f50cb1bc919f4ab502ef2c38f6bf5
Author: Günther Deschner g...@samba.org
Date: Mon Nov 2 13:01:58 2009 +0100
s3-gencache: restore gencache_get behavior with NULL args (with torture
test).
Without this, we panic in wins_srv_is_dead() and fail to start nmbd with
wins support.
Volker, please check.
Guenther
---
Summary of changes:
source3/lib/gencache.c| 12
source3/torture/torture.c |5 +
2 files changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 6de653f..4889d7c 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -529,11 +529,15 @@ bool gencache_get(const char *keystr, char **value,
time_t *ptimeout)
SAFE_FREE(blob.data);
return false;
}
- *value = SMB_STRDUP((char *)blob.data);
- data_blob_free(blob);
- if (*value == NULL) {
- return false;
+ if (value) {
+ *value = SMB_STRDUP((char *)blob.data);
+ data_blob_free(blob);
+ if (*value == NULL) {
+ return false;
+ }
+ return true;
}
+ data_blob_free(blob);
return true;
}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index ca499a9..bda82f2 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -6431,6 +6431,11 @@ static bool run_local_gencache(int dummy)
return False;
}
+ if (!gencache_get(foo, NULL, NULL)) {
+ d_printf(%s: gencache_get() failed\n, __location__);
+ return False;
+ }
+
if (!gencache_get(foo, val, tm)) {
d_printf(%s: gencache_get() failed\n, __location__);
return False;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via f39c257... s3-gencache: restore gencache_get behavior with NULL
args (with torture test).
from efbca60... WHATSNEW: Update release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit f39c2577fc649713cfd1e0fb9c164ee4423c96f7
Author: Günther Deschner g...@samba.org
Date: Mon Nov 2 13:01:58 2009 +0100
s3-gencache: restore gencache_get behavior with NULL args (with torture
test).
Without this, we panic in wins_srv_is_dead() and fail to start nmbd with
wins support.
Volker, please check.
Guenther
(cherry picked from commit f35a1b95aa6f50cb1bc919f4ab502ef2c38f6bf5)
---
Summary of changes:
source3/lib/gencache.c| 12
source3/torture/torture.c |5 +
2 files changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 6de653f..4889d7c 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -529,11 +529,15 @@ bool gencache_get(const char *keystr, char **value,
time_t *ptimeout)
SAFE_FREE(blob.data);
return false;
}
- *value = SMB_STRDUP((char *)blob.data);
- data_blob_free(blob);
- if (*value == NULL) {
- return false;
+ if (value) {
+ *value = SMB_STRDUP((char *)blob.data);
+ data_blob_free(blob);
+ if (*value == NULL) {
+ return false;
+ }
+ return true;
}
+ data_blob_free(blob);
return true;
}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index ca499a9..bda82f2 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -6431,6 +6431,11 @@ static bool run_local_gencache(int dummy)
return False;
}
+ if (!gencache_get(foo, NULL, NULL)) {
+ d_printf(%s: gencache_get() failed\n, __location__);
+ return False;
+ }
+
if (!gencache_get(foo, val, tm)) {
d_printf(%s: gencache_get() failed\n, __location__);
return False;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d9bdd17... s3: Fix a 100% CPU loop when ctdbd dies during a traverse
from f35a1b9... s3-gencache: restore gencache_get behavior with NULL
args (with torture test).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d9bdd17522c6d2916aedb29721c79a9c421ec1eb
Author: Volker Lendecke v...@samba.org
Date: Mon Nov 2 16:59:15 2009 +0100
s3: Fix a 100% CPU loop when ctdbd dies during a traverse
---
Summary of changes:
source3/lib/ctdbd_conn.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 0af4204..ffd79c9 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1167,6 +1167,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
status = NT_STATUS_OK;
+ break;
}
if (!NT_STATUS_IS_OK(status)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 892f929... s3: Fix a 100% CPU loop when ctdbd dies during a traverse
from f39c257... s3-gencache: restore gencache_get behavior with NULL
args (with torture test).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 892f92972112e55fdea250c198623d2fd4f70d7c
Author: Volker Lendecke v...@samba.org
Date: Mon Nov 2 16:59:15 2009 +0100
s3: Fix a 100% CPU loop when ctdbd dies during a traverse
---
Summary of changes:
source3/lib/ctdbd_conn.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 0af4204..ffd79c9 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1167,6 +1167,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
status = NT_STATUS_OK;
+ break;
}
if (!NT_STATUS_IS_OK(status)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 6a11a1d... ndr64: added support for trailing gap alignment
from 892f929... s3: Fix a 100% CPU loop when ctdbd dies during a traverse
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 6a11a1d720b12889b5cbe6ed1f7751ce0d22d4b9
Author: Andrew Tridgell tri...@samba.org
Date: Thu Oct 1 16:08:02 2009 +1000
ndr64: added support for trailing gap alignment
NDR64 has a 'trailing gap' alignment, which aligns the end of a
structure on the overall structure alignment.
This explains the discrepancy we had with the RPC-SAMR test and NDR64
---
Summary of changes:
librpc/ndr/libndr.h |2 ++
librpc/ndr/ndr_basic.c | 18 ++
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |4
3 files changed, 24 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index f6f5170..3236932 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -500,6 +500,8 @@ enum ndr_err_code ndr_push_align(struct ndr_push *ndr,
size_t size);
enum ndr_err_code ndr_pull_align(struct ndr_pull *ndr, size_t size);
enum ndr_err_code ndr_push_union_align(struct ndr_push *ndr, size_t size);
enum ndr_err_code ndr_pull_union_align(struct ndr_pull *ndr, size_t size);
+enum ndr_err_code ndr_push_trailer_align(struct ndr_push *ndr, size_t size);
+enum ndr_err_code ndr_pull_trailer_align(struct ndr_pull *ndr, size_t size);
enum ndr_err_code ndr_push_bytes(struct ndr_push *ndr, const uint8_t *data,
uint32_t n);
enum ndr_err_code ndr_push_zero(struct ndr_push *ndr, uint32_t n);
enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags,
const uint8_t *data, uint32_t n);
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index f3b7e75..807db59 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -573,6 +573,24 @@ _PUBLIC_ enum ndr_err_code ndr_pull_union_align(struct
ndr_pull *ndr, size_t siz
return NDR_ERR_SUCCESS;
}
+_PUBLIC_ enum ndr_err_code ndr_push_trailer_align(struct ndr_push *ndr, size_t
size)
+{
+ /* MS-RPCE section 2.2.5.3.4.1 */
+ if (ndr-flags LIBNDR_FLAG_NDR64) {
+ return ndr_push_align(ndr, size);
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_trailer_align(struct ndr_pull *ndr, size_t
size)
+{
+ /* MS-RPCE section 2.2.5.3.4.1 */
+ if (ndr-flags LIBNDR_FLAG_NDR64) {
+ return ndr_pull_align(ndr, size);
+ }
+ return NDR_ERR_SUCCESS;
+}
+
/*
push some bytes
*/
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 9a02d52..11a43b4 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1235,6 +1235,8 @@ sub ParseStructPushPrimitives($)
}
$self-ParseElementPush($_, $ndr, $env, 1, 0) foreach
(@{$struct-{ELEMENTS}});
+
+ $self-pidl(NDR_CHECK(ndr_push_trailer_align($ndr,
$struct-{ALIGN})););
}
sub ParseStructPushDeferred()
@@ -1533,6 +1535,8 @@ sub ParseStructPullPrimitives($)
$self-ParseElementPull($_, $ndr, $env, 1, 0) foreach
(@{$struct-{ELEMENTS}});
$self-add_deferred();
+
+ $self-pidl(NDR_CHECK(ndr_pull_trailer_align($ndr,
$struct-{ALIGN})););
}
sub ParseStructPullDeferred($)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 494d827... Fix bug 6867 - trans2findnext returns reply_nterror(req,
ntstatus) In a directory with a lot of files. Jeremy.
from d9bdd17... s3: Fix a 100% CPU loop when ctdbd dies during a traverse
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 494d8271d43c4bc44a57463e34ae8c35423e4443
Author: Jeremy Allison j...@samba.org
Date: Mon Nov 2 12:15:25 2009 -0800
Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a
directory with a lot of files.
Jeremy.
---
Summary of changes:
source3/smbd/trans2.c | 28
1 files changed, 16 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 59b778c..bc7a387 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2575,23 +2575,26 @@ static void call_trans2findnext(connection_struct *conn,
requires_resume_key = (findnext_flags
FLAG_TRANS2_FIND_REQUIRE_RESUME);
continue_bit = (findnext_flags FLAG_TRANS2_FIND_CONTINUE);
- srvstr_get_path_wcard(ctx, params, req-flags2, resume_name,
+ if (!continue_bit) {
+ /* We only need resume_name if continue_bit is zero. */
+ srvstr_get_path_wcard(ctx, params, req-flags2, resume_name,
params+12,
total_params - 12, STR_TERMINATE, ntstatus,
mask_contains_wcard);
- if (!NT_STATUS_IS_OK(ntstatus)) {
- /* Win9x or OS/2 can send a resume name of .. or .. This
will cause the parser to
- complain (it thinks we're asking for the directory above the
shared
- path or an invalid name). Catch this as the resume name is
only compared, never used in
- a file access. JRA. */
- srvstr_pull_talloc(ctx, params, req-flags2,
+ if (!NT_STATUS_IS_OK(ntstatus)) {
+ /* Win9x or OS/2 can send a resume name of .. or ..
This will cause the parser to
+ complain (it thinks we're asking for the directory
above the shared
+ path or an invalid name). Catch this as the resume
name is only compared, never used in
+ a file access. JRA. */
+ srvstr_pull_talloc(ctx, params, req-flags2,
resume_name, params+12,
total_params - 12,
STR_TERMINATE);
- if (!resume_name || !(ISDOT(resume_name) ||
ISDOTDOT(resume_name))) {
- reply_nterror(req, ntstatus);
- return;
+ if (!resume_name || !(ISDOT(resume_name) ||
ISDOTDOT(resume_name))) {
+ reply_nterror(req, ntstatus);
+ return;
+ }
}
}
@@ -2599,7 +2602,8 @@ static void call_trans2findnext(connection_struct *conn,
close_after_request=%d, close_if_end = %d requires_resume_key = %d \
resume_key = %d resume name = %s continue=%d level = %d\n,
dptr_num, max_data_bytes, maxentries, close_after_request,
close_if_end,
- requires_resume_key, resume_key, resume_name, continue_bit,
info_level));
+ requires_resume_key, resume_key,
+ resume_name ? resume_name : (NULL), continue_bit,
info_level));
if (!maxentries) {
/* W2K3 seems to treat zero as 1. */
@@ -2724,7 +2728,7 @@ total_data=%u (should be %u)\n, (unsigned
int)total_data, (unsigned int)IVAL(pd
* depend on the last file name instead.
*/
- if(*resume_name !continue_bit) {
+ if(!continue_bit resume_name *resume_name) {
SMB_STRUCT_STAT st;
long current_pos = 0;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via a385927... Fix bug 6867 - trans2findnext returns reply_nterror(req,
ntstatus) In a directory with a lot of files. Jeremy.
from 6a11a1d... ndr64: added support for trailing gap alignment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit a38592722b05bf81905198c8f244d7303abee030
Author: Jeremy Allison j...@samba.org
Date: Mon Nov 2 12:15:25 2009 -0800
Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a
directory with a lot of files.
Jeremy.
---
Summary of changes:
source3/smbd/trans2.c | 28
1 files changed, 16 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 59b778c..bc7a387 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2575,23 +2575,26 @@ static void call_trans2findnext(connection_struct *conn,
requires_resume_key = (findnext_flags
FLAG_TRANS2_FIND_REQUIRE_RESUME);
continue_bit = (findnext_flags FLAG_TRANS2_FIND_CONTINUE);
- srvstr_get_path_wcard(ctx, params, req-flags2, resume_name,
+ if (!continue_bit) {
+ /* We only need resume_name if continue_bit is zero. */
+ srvstr_get_path_wcard(ctx, params, req-flags2, resume_name,
params+12,
total_params - 12, STR_TERMINATE, ntstatus,
mask_contains_wcard);
- if (!NT_STATUS_IS_OK(ntstatus)) {
- /* Win9x or OS/2 can send a resume name of .. or .. This
will cause the parser to
- complain (it thinks we're asking for the directory above the
shared
- path or an invalid name). Catch this as the resume name is
only compared, never used in
- a file access. JRA. */
- srvstr_pull_talloc(ctx, params, req-flags2,
+ if (!NT_STATUS_IS_OK(ntstatus)) {
+ /* Win9x or OS/2 can send a resume name of .. or ..
This will cause the parser to
+ complain (it thinks we're asking for the directory
above the shared
+ path or an invalid name). Catch this as the resume
name is only compared, never used in
+ a file access. JRA. */
+ srvstr_pull_talloc(ctx, params, req-flags2,
resume_name, params+12,
total_params - 12,
STR_TERMINATE);
- if (!resume_name || !(ISDOT(resume_name) ||
ISDOTDOT(resume_name))) {
- reply_nterror(req, ntstatus);
- return;
+ if (!resume_name || !(ISDOT(resume_name) ||
ISDOTDOT(resume_name))) {
+ reply_nterror(req, ntstatus);
+ return;
+ }
}
}
@@ -2599,7 +2602,8 @@ static void call_trans2findnext(connection_struct *conn,
close_after_request=%d, close_if_end = %d requires_resume_key = %d \
resume_key = %d resume name = %s continue=%d level = %d\n,
dptr_num, max_data_bytes, maxentries, close_after_request,
close_if_end,
- requires_resume_key, resume_key, resume_name, continue_bit,
info_level));
+ requires_resume_key, resume_key,
+ resume_name ? resume_name : (NULL), continue_bit,
info_level));
if (!maxentries) {
/* W2K3 seems to treat zero as 1. */
@@ -2724,7 +2728,7 @@ total_data=%u (should be %u)\n, (unsigned
int)total_data, (unsigned int)IVAL(pd
* depend on the last file name instead.
*/
- if(*resume_name !continue_bit) {
+ if(!continue_bit resume_name *resume_name) {
SMB_STRUCT_STAT st;
long current_pos = 0;
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - aab0b67097154b444ddb464d65fe128d33f2dab8
The branch, v3-4-ctdb has been updated
via aab0b67097154b444ddb464d65fe128d33f2dab8 (commit)
from be7a16a43a458bb3033bbd2256882ca17a11c6a1 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -
commit aab0b67097154b444ddb464d65fe128d33f2dab8
Author: Volker Lendecke v...@samba.org
Date: Mon Nov 2 16:59:15 2009 +0100
s3: Fix a 100% CPU loop when ctdbd dies during a traverse
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
source3/lib/ctdbd_conn.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index d34d23e..540e62d 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1168,6 +1168,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
status = NT_STATUS_OK;
+ break;
}
if (!NT_STATUS_IS_OK(status)) {
--
SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 29173408a3d9050d83aee87b033b0e8937ce9240
The branch, v3-4-ctdb has been updated via 29173408a3d9050d83aee87b033b0e8937ce9240 (commit) via ddc9184de972168ebb8a7f70efb1e1a19800a745 (commit) via b991de4f20eb46410fc38aae9aad675eaa86ab06 (commit) via 7e9c18c7d46b45bb1a2ed4af1f2aacf401c4ff0b (commit) via d5cf73232aff9bd7e5ebb8b70c8f28aaea3780a9 (commit) via bee87fb72bdf4a2374e4ad341bd3376e963be5b8 (commit) via 2ba7cb6004251fa0c14a2204bf809803181f76b3 (commit) via 0080b44e63e28716b9b44622fa1c2454580a730b (commit) via 05031c3629d283632af36fe067727a32b643cc6a (commit) via 28a72732a1f613132044f371533c46b3b4e09be9 (commit) via bb3c277954e9ae934d96aa3de6300e62c98a157c (commit) via 21b97f4a498ea712140c6724a762f6b3fb3fc7a7 (commit) via 9065e4b5f7b4b02179b2263a254a7e7f0c2b508b (commit) via 2902d4738a2c8207f7d6cf5b998f01db536d58b7 (commit) from aab0b67097154b444ddb464d65fe128d33f2dab8 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 29173408a3d9050d83aee87b033b0e8937ce9240 Author: Michael Adam ob...@samba.org Date: Tue Nov 3 00:51:27 2009 +0100 s3:registry: add an extra check for dsize==0 to regdb_fetch_keys_internal() Don't only rely on dptr == NULL. I stumbled over this one when rewriting some of the dbwrap_ctdb code. Michael commit ddc9184de972168ebb8a7f70efb1e1a19800a745 Author: Michael Adam ob...@samba.org Date: Tue Nov 3 00:47:37 2009 +0100 s3:registry: add safety check for return value of tdb_unpack to regdb_fetch_keys_internal() Prevents segfaults in some situations. (For a non existent or empty record, we sometimes rely on the fetch operation to return dsize==0 and sometimes we rely on dptr==NULL.) Michael commit b991de4f20eb46410fc38aae9aad675eaa86ab06 Author: Michael Adam ob...@samba.org Date: Sat Oct 31 13:16:34 2009 +0100 s3:dbwrap_ctdb: add debug message to transaction_fetch_start() for the case that another local process has started a transaction bewteen releasing the transaction_lock record and starting the transaction. Michael commit 7e9c18c7d46b45bb1a2ed4af1f2aacf401c4ff0b Author: Michael Adam ob...@samba.org Date: Sat Oct 31 13:13:04 2009 +0100 s3:dbwrap_ctdb: split combined check in two and add descriptive debug in db_ctdb_transaction_fetch_start() for error conditions when re-fetching the transaction_lock record inside the transaction Michael commit d5cf73232aff9bd7e5ebb8b70c8f28aaea3780a9 Author: Michael Adam ob...@samba.org Date: Thu Oct 29 00:01:45 2009 +0100 s3:dbwrap_ctdb: fix race condition with concurrent transactions on the same node. In ctdb_transaction_commit(), when the trans2_commit control fails, there is a race condition in the 1 second sleep between the local transaction_cancel and the call to ctdb_replay_transaction(): The database is not locked, and neither is the transaction_lock record. So another client can start and possibly complete a new transaction in this gap, but only on the same node: The locking of the transaction_lock record on a different node which involves migration of the record to the other node has been disabled by introduction of the transaction_active flag on the db which closes precisely this gap from the start of the commit until the call to TRANS2_FINISH or TRANS2_ERROR. But this mechanism does not cover the case where a process on the same node tries to start a transaction: There is no obstacle to locking the transaction_lock record because the record does not need to be migrated. This commit closes this race condition in ctdb_transaction_fetch_start() by using the new ctdb_ctrl_transaction_active() call to ask the local ctdb daemon whether it has a transaction running on the database. If so, the check is repeated until the running transaction is done. This does introduce an additional call to the local ctdbd when starting transactions, but it does close the (hopefully) last race condition. Michael commit bee87fb72bdf4a2374e4ad341bd3376e963be5b8 Author: Michael Adam ob...@samba.org Date: Wed Oct 28 23:56:59 2009 +0100 s3:configure: add a check for the new CTDB_CONTROL_TRANS2_ACTIVE Michael commit 2ba7cb6004251fa0c14a2204bf809803181f76b3 Author: Michael Adam ob...@samba.org Date: Wed Oct 28 23:56:03 2009 +0100 s3:dbwrap_ctdb: add new db_ctdb_transaction_active() that calls CTDB_CONTROL_TRANS2_COMMIT Michael commit 0080b44e63e28716b9b44622fa1c2454580a730b Author: Michael Adam ob...@samba.org Date: Wed Oct 28 01:54:04 2009 +0100 s3:dbwrap_ctdb: fix a race in starting concurrent transactions on a single node There are two races in concurrent transactions on a single node. One in
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via cc5b22a... s3:registry: add an extra check for dsize==0 to regdb_fetch_keys_internal() via f6f2151... s3:registry: add safety check for return value of tdb_unpack to regdb_fetch_keys_internal() via 25bdf27... s3:dbwrap_ctdb: add debug message to transaction_fetch_start() via 9fef6a6... s3:dbwrap_ctdb: split combined check in two and add descriptive debug via f37439e... s3:dbwrap_ctdb: fix race condition with concurrent transactions on the same node. via 08d2a3f... s3:configure: add a check for the new CTDB_CONTROL_TRANS2_ACTIVE via 9be4d3d... s3:dbwrap_ctdb: add new db_ctdb_transaction_active() that calls CTDB_CONTROL_TRANS2_COMMIT via 9bd6b9d... s3:dbwrap_ctdb: fix a race in starting concurrent transactions on a single node via 8d61b8a... s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch_start via 0ec476f... s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch() via 4973ff6... s3:dbwrap_ctdb: add a function db_ctdb_ltdb_fetch() via 6a89834... s3:dbrwap_ctdb: add a function db_ctdb_ltdb_store() via d5aa758... s3:dbwrap_ctdb: reformat a comment slightly to enhance clearness. from 494d827... Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a directory with a lot of files. Jeremy. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cc5b22a0165a1c7d6a0839edd67b8107fc883464 Author: Michael Adam ob...@samba.org Date: Tue Nov 3 00:51:27 2009 +0100 s3:registry: add an extra check for dsize==0 to regdb_fetch_keys_internal() Don't only rely on dptr == NULL. I stumbled over this one when rewriting some of the dbwrap_ctdb code. Michael commit f6f2151a3947cc105481c64a31d2405f239948cc Author: Michael Adam ob...@samba.org Date: Tue Nov 3 00:47:37 2009 +0100 s3:registry: add safety check for return value of tdb_unpack to regdb_fetch_keys_internal() Prevents segfaults in some situations. (For a non existent or empty record, we sometimes rely on the fetch operation to return dsize==0 and sometimes we rely on dptr==NULL.) Michael commit 25bdf27eaa634f9e54e6252397942beb46f07db5 Author: Michael Adam ob...@samba.org Date: Sat Oct 31 13:16:34 2009 +0100 s3:dbwrap_ctdb: add debug message to transaction_fetch_start() for the case that another local process has started a transaction bewteen releasing the transaction_lock record and starting the transaction. Michael commit 9fef6ad59ee8cc2ef41f96efa3dd2efba30c Author: Michael Adam ob...@samba.org Date: Sat Oct 31 13:13:04 2009 +0100 s3:dbwrap_ctdb: split combined check in two and add descriptive debug in db_ctdb_transaction_fetch_start() for error conditions when re-fetching the transaction_lock record inside the transaction Michael commit f37439efd2fbd9a9e995d838da20d60337ca07f7 Author: Michael Adam ob...@samba.org Date: Thu Oct 29 00:01:45 2009 +0100 s3:dbwrap_ctdb: fix race condition with concurrent transactions on the same node. In ctdb_transaction_commit(), when the trans2_commit control fails, there is a race condition in the 1 second sleep between the local transaction_cancel and the call to ctdb_replay_transaction(): The database is not locked, and neither is the transaction_lock record. So another client can start and possibly complete a new transaction in this gap, but only on the same node: The locking of the transaction_lock record on a different node which involves migration of the record to the other node has been disabled by introduction of the transaction_active flag on the db which closes precisely this gap from the start of the commit until the call to TRANS2_FINISH or TRANS2_ERROR. But this mechanism does not cover the case where a process on the same node tries to start a transaction: There is no obstacle to locking the transaction_lock record because the record does not need to be migrated. This commit closes this race condition in ctdb_transaction_fetch_start() by using the new ctdb_ctrl_transaction_active() call to ask the local ctdb daemon whether it has a transaction running on the database. If so, the check is repeated until the running transaction is done. This does introduce an additional call to the local ctdbd when starting transactions, but it does close the (hopefully) last race condition. Michael commit 08d2a3f4bf1a4e3ce571ff59c9a582243c3db57a Author: Michael Adam ob...@samba.org Date: Wed Oct 28 23:56:59 2009 +0100 s3:configure: add a check for the new CTDB_CONTROL_TRANS2_ACTIVE Michael commit 9be4d3dd4f46f0fbd4e20ec33bae7f2e23dba2fd Author: Michael Adam ob...@samba.org Date:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f9c9dee... Convert from numbers to correct SMB_FIND_XX constant
names. Jeremy.
from cc5b22a... s3:registry: add an extra check for dsize==0 to
regdb_fetch_keys_internal()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f9c9dee01373d6fd069e36ba6024580b8962f230
Author: Jeremy Allison j...@samba.org
Date: Mon Nov 2 16:17:36 2009 -0800
Convert from numbers to correct SMB_FIND_XX constant names.
Jeremy.
---
Summary of changes:
source3/libsmb/clilist.c | 20
1 files changed, 12 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index a84a647..5a97204 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -38,8 +38,9 @@ static size_t calc_next_entry_offset(const char *base, const
char *pdata_end)
/
Interpret a long filename structure - this is mostly guesses at the moment.
The length of the structure is returned
- The structure of a long filename depends on the info level. 260 is used
- by NT and 2 is used by OS/2
+ The structure of a long filename depends on the info level.
+ SMB_FIND_FILE_BOTH_DIRECTORY_INFO is used
+ by NT and SMB_FIND_EA_SIZE is used by OS/2
/
static size_t interpret_long_filename(TALLOC_CTX *ctx,
@@ -64,7 +65,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
finfo-cli = cli;
switch (level) {
- case 1: /* OS/2 understands this */
+ case SMB_FIND_INFO_STANDARD: /* OS/2 understands this */
/* these dates are converted to GMT by
make_unix_date */
if (pdata_end - base 27) {
@@ -109,7 +110,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
p += ret;
return PTR_DIFF(p, base);
- case 2: /* this is what OS/2 uses mostly */
+ case SMB_FIND_EA_SIZE: /* this is what OS/2 uses mostly */
/* these dates are converted to GMT by
make_unix_date */
if (pdata_end - base 31) {
@@ -138,7 +139,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
p += ret;
return PTR_DIFF(p, base) + 1;
- case 260: /* NT uses this, but also accepts 2 */
+ case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: /* NT uses this, but
also accepts 2 */
{
size_t namelen, slen;
@@ -248,8 +249,10 @@ int cli_list_new(struct cli_state *cli,const char
*Mask,uint16 attribute,
TALLOC_CTX *frame = talloc_stackframe();
DATA_BLOB last_name_raw = data_blob(NULL, 0);
- /* NT uses 260, OS/2 uses 2. Both accept 1. */
- info_level = (cli-capabilitiesCAP_NT_SMBS)?260:1;
+ /* NT uses SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
+ OS/2 uses SMB_FIND_EA_SIZE. Both accept SMB_FIND_INFO_STANDARD. */
+ info_level = (cli-capabilitiesCAP_NT_SMBS)?
+ SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_INFO_STANDARD;
mask = SMB_STRDUP(Mask);
if (!mask) {
@@ -389,7 +392,8 @@ int cli_list_new(struct cli_state *cli,const char
*Mask,uint16 attribute,
/* we might need the lastname for continuations */
for (p2=p,i=0;iff_searchcount p2 rdata_end;i++) {
- if ((info_level == 260) (i == ff_searchcount-1)) {
+ if ((info_level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO)
+ (i == ff_searchcount-1)) {
/* Last entry - fixup the last offset length. */
SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 21e527c... Convert from numbers to correct SMB_FIND_XX constant
names. Jeremy.
from a385927... Fix bug 6867 - trans2findnext returns reply_nterror(req,
ntstatus) In a directory with a lot of files. Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 21e527c5d3d98c6e730c23281d68b0b18737b704
Author: Jeremy Allison j...@samba.org
Date: Mon Nov 2 16:17:36 2009 -0800
Convert from numbers to correct SMB_FIND_XX constant names.
Jeremy.
---
Summary of changes:
source3/libsmb/clilist.c | 20
1 files changed, 12 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index a84a647..5a97204 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -38,8 +38,9 @@ static size_t calc_next_entry_offset(const char *base, const
char *pdata_end)
/
Interpret a long filename structure - this is mostly guesses at the moment.
The length of the structure is returned
- The structure of a long filename depends on the info level. 260 is used
- by NT and 2 is used by OS/2
+ The structure of a long filename depends on the info level.
+ SMB_FIND_FILE_BOTH_DIRECTORY_INFO is used
+ by NT and SMB_FIND_EA_SIZE is used by OS/2
/
static size_t interpret_long_filename(TALLOC_CTX *ctx,
@@ -64,7 +65,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
finfo-cli = cli;
switch (level) {
- case 1: /* OS/2 understands this */
+ case SMB_FIND_INFO_STANDARD: /* OS/2 understands this */
/* these dates are converted to GMT by
make_unix_date */
if (pdata_end - base 27) {
@@ -109,7 +110,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
p += ret;
return PTR_DIFF(p, base);
- case 2: /* this is what OS/2 uses mostly */
+ case SMB_FIND_EA_SIZE: /* this is what OS/2 uses mostly */
/* these dates are converted to GMT by
make_unix_date */
if (pdata_end - base 31) {
@@ -138,7 +139,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
p += ret;
return PTR_DIFF(p, base) + 1;
- case 260: /* NT uses this, but also accepts 2 */
+ case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: /* NT uses this, but
also accepts 2 */
{
size_t namelen, slen;
@@ -248,8 +249,10 @@ int cli_list_new(struct cli_state *cli,const char
*Mask,uint16 attribute,
TALLOC_CTX *frame = talloc_stackframe();
DATA_BLOB last_name_raw = data_blob(NULL, 0);
- /* NT uses 260, OS/2 uses 2. Both accept 1. */
- info_level = (cli-capabilitiesCAP_NT_SMBS)?260:1;
+ /* NT uses SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
+ OS/2 uses SMB_FIND_EA_SIZE. Both accept SMB_FIND_INFO_STANDARD. */
+ info_level = (cli-capabilitiesCAP_NT_SMBS)?
+ SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_INFO_STANDARD;
mask = SMB_STRDUP(Mask);
if (!mask) {
@@ -389,7 +392,8 @@ int cli_list_new(struct cli_state *cli,const char
*Mask,uint16 attribute,
/* we might need the lastname for continuations */
for (p2=p,i=0;iff_searchcount p2 rdata_end;i++) {
- if ((info_level == 260) (i == ff_searchcount-1)) {
+ if ((info_level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO)
+ (i == ff_searchcount-1)) {
/* Last entry - fixup the last offset length. */
SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
}
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.102-21-g020e2e3
The branch, master has been updated
via 020e2e30e56b9675f345ee62d6bf585396208059 (commit)
via fb83dba255fc91413a475b273e374e0c4d538137 (commit)
via 209ff041596e39688186c5863ed3e816b8e4 (commit)
via f98fefbc566eefbfcc660646af6e25256ab82b13 (commit)
from a5d90d8ed8b44355c4ffb9c32ded772025fcc174 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 020e2e30e56b9675f345ee62d6bf585396208059
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Nov 3 11:46:37 2009 +1100
new version 1.0.103
commit fb83dba255fc91413a475b273e374e0c4d538137
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Nov 3 10:48:27 2009 +1100
move the check to skip vacuuming on persistent database to the
ctdb_vacuuming_init() function
commit 209ff041596e39688186c5863ed3e816b8e4
Author: Michael Adam ob...@samba.org
Date: Mon Nov 2 01:37:07 2009 +0100
packaging: use githash in rpm release by default.
setting USE_GITHASH=no in the environment makes
makerpms.sh omit the git hash
Michael
commit f98fefbc566eefbfcc660646af6e25256ab82b13
Author: Michael Adam ob...@samba.org
Date: Tue Nov 3 00:04:27 2009 +0100
server: disable vacuuming for persistent tdbs.
The vacuum process treats persistent databases the same as
non-persistent and thus ignores the extra state for transactions.
This way, it breaks the api-level transactions.
Michael
---
Summary of changes:
packaging/RPM/{ctdb.spec = ctdb.spec.in} | 12 ++--
packaging/RPM/makerpms.sh | 11 +++
server/ctdb_ltdb_server.c |3 ++-
server/ctdb_vacuum.c |5 +
4 files changed, 28 insertions(+), 3 deletions(-)
rename packaging/RPM/{ctdb.spec = ctdb.spec.in} (98%)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec.in
similarity index 98%
rename from packaging/RPM/ctdb.spec
rename to packaging/RPM/ctdb.spec.in
index a64b4b8..2052ae4 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec.in
@@ -4,8 +4,8 @@ Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Name: ctdb
-Version: 1.0.102
-Release: 1
+Version: 1.0.103
+Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -118,6 +118,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/ctdb.pc
%changelog
+* Tue Nov 3 2009 : Version 1.0.103
+ - Dont use vacuuming on persistent databases
+ - Michael A : transaction updates to persistent databases
+ - Dont activate service automatically when installing the RPM. Leave this to
the admin.
+ - Create a child process to send all log messages to, to prevent a hung/slow
syslogd
+ from blocking the main daemon. In this case, discard log messages instead
and let the child
+ process block.
+ - Michael A: updates to log messages
* Thu Oct 29 2009 : Version 1.0.102
- Wolfgang: fix for the vacuuming code
- Wolfgang: stronger tests for persistent database filename tests
diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 846ab7f..a51099c 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -41,8 +41,19 @@ SPECDIR=`rpm --eval %_specdir`
SRCDIR=`rpm --eval %_sourcedir`
SPECFILE=ctdb.spec
+SPECFILE_IN=ctdb.spec.in
RPMBUILD=rpmbuild
+GITHASH=.$(git log --pretty=format:%h -1)
+
+if test x$USE_GITHASH = xno ; then
+ GITHASH=
+fi
+
+sed -e s/GITHASH/${GITHASH}/g \
+${DIRNAME}/${SPECFILE_IN} \
+${DIRNAME}/${SPECFILE}
+
VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 09e40c7..1aa0f69 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -295,7 +295,8 @@ static int ctdb_local_attach(struct ctdb_context *ctdb,
const char *db_name, boo
ret = ctdb_vacuum_init(ctdb_db);
if (ret != 0) {
- DEBUG(DEBUG_CRIT,(Failed to setup vacuuming for database
'%s'\n, ctdb_db-db_name));
+ DEBUG(DEBUG_CRIT,(Failed to setup vacuuming for
+ database '%s'\n, ctdb_db-db_name));
talloc_free(ctdb_db);
return -1;
}
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 80e5dbd..52f2060 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -872,6 +872,11 @@ ctdb_vacuum_event(struct event_context *ev, struct
timed_event *te,
*/
int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
{
+ if (ctdb_db-persistent != 0) {
+ DEBUG(DEBUG_ERR,(Vacuuming is disabled for persistent database
%s\n, ctdb_db-db_name));
+
[SCM] CTDB repository - annotated tag ctdb-1.0.103 created - ctdb-1.0.103
The annotated tag, ctdb-1.0.103 has been created at b7306b101ed1c165089930346d52fba352d8150f (tag) tagging 020e2e30e56b9675f345ee62d6bf585396208059 (commit) replaces ctdb-1.0.102 tagged by Ronnie Sahlberg on Tue Nov 3 14:22:34 2009 +1100 - Log - tag for 103 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBK76IK2aJ36aon/y8RAhkEAJ9v+526Ib72CQqrOHemgaihQGYLoQCfVNDH tIsFh98nKfE4E3J5NuW/j2Y= =ObnZ -END PGP SIGNATURE- Michael Adam (17): server: trans2_active: don't report a transaction active on the node that performs the transaction client: improve control timed out debug message server: add positive debug statements to trans2_commit and trans2_finished server: extend a debug message in ctdb_control_trans2_error() server: fix a debug message in trans2_commit - log the correct db_id server: output client_id in some debug messages in trans2_commit server: line-wrap a debug statement in trans2_commit server: uniformly log db and client ids as 8-digit hex numbers in trans2_commit client: log db_id as 8-digit hex in ctdb_transaction_fetch_start() server: fix debug message in trans2_commit (refusing persistent store during transaction) packaging(RPM): don't touch the run levels in ctdb install/udpate. client: add a debug message when a transaction_commit needs to be retried client: fix a race in the local race condition fix in transaction_start Revert dont exit on a commit failure client: randomize the transaction_start retry loop: server: disable vacuuming for persistent tdbs. packaging: use githash in rpm release by default. Ronnie Sahlberg (4): create a child process to write to syslog. start the syslog child a little later, after we have forked and detached from the local shell move the check to skip vacuuming on persistent database to the ctdb_vacuuming_init() function new version 1.0.103 --- -- CTDB repository
Build status as of Tue Nov 3 07:00:04 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-11-02 00:00:29.0 -0700 +++ /home/build/master/cache/broken_results.txt 2009-11-03 00:00:36.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Mon Nov 2 07:00:04 2009 +Build status as of Tue Nov 3 07:00:04 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 5 1 0 +ccache 6 1 0 distcc 0 0 0 -ldb 22 22 0 -libreplace 1 1 0 +ldb 26 26 0 +libreplace 2 1 0 lorikeet 0 0 0 -pidl 2 2 0 -ppp 3 0 0 +pidl 3 3 0 +ppp 4 0 0 rsync28 11 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 2 2 0 +samba_3_current 2 1 0 samba_3_master 25 24 1 -samba_3_next 25 24 0 -samba_4_0_test 26 24 0 -talloc 2 2 0 -tdb 6 6 0 +samba_3_next 24 22 0 +samba_4_0_test 25 23 0 +talloc 3 3 0 +tdb 4 4 0
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-65-7-g67e1376
The branch, v3-2-ctdb has been updated
via 67e13766284ac39e9a7e1098a7252c7f5243d447 (commit)
via 3d5b9abb49b9d525106eb76097075153881dad36 (commit)
from 587caa3d8ad6a97c480e371a3cc5bc3b2c932ec7 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 67e13766284ac39e9a7e1098a7252c7f5243d447
Author: Volker Lendecke v...@samba.org
Date: Mon Nov 2 16:59:15 2009 +0100
s3: Fix a 100% CPU loop when ctdbd dies during a traverse
commit 3d5b9abb49b9d525106eb76097075153881dad36
Author: Michael Adam ob...@samba.org
Date: Tue Nov 3 08:08:34 2009 +0100
v3-2-ctdb: Bump the ctdb vendor patch level to 68.
Michael
---
Summary of changes:
source/VERSION |2 +-
source/lib/ctdbd_conn.c |1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/VERSION b/source/VERSION
index 7374600..e8f05af 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# - CVS 3.0.0rc2-VendorVersion#
SAMBA_VERSION_VENDOR_SUFFIX=ctdb
-SAMBA_VERSION_VENDOR_PATCH=67
+SAMBA_VERSION_VENDOR_PATCH=68
diff --git a/source/lib/ctdbd_conn.c b/source/lib/ctdbd_conn.c
index 33a69f6..0020fcd 100644
--- a/source/lib/ctdbd_conn.c
+++ b/source/lib/ctdbd_conn.c
@@ -1162,6 +1162,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
status = NT_STATUS_OK;
+ break;
}
if (!NT_STATUS_IS_OK(status)) {
--
SAMBA-CTDB repository
