[SCM] Samba Shared Repository - branch master updated
Martin Schwenke
martins at samba.org
Thu Sep 11 03:32:04 MDT 2014
The branch, master has been updated
via 4e5a6b1 ctdb-locking: Set real-time priority for lock helpers
via e6127a9 ctdb-daemon: Increment pending calls statistics correctly
from 01d4c0e torture: Provide enough space for test EA name in raw.eas test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4e5a6b154e1549e959c5de4b58432e33c0d57b55
Author: Amitay Isaacs <amitay at gmail.com>
Date: Wed Sep 10 18:14:24 2014 +1000
ctdb-locking: Set real-time priority for lock helpers
To avoid lock helper starvation when userspace robust mutexes are
enabled.
Commit 6f072f85a138f595494dbec137bcf23d1e666acc removed reset_scheduler(),
to avoid resetting scheduler priority. However, that is not sufficient
because of commit 1be8564e553ce044426dbe7b3987edf514832940, which sets
SCHED_RESET_ON_FORK flag. With SCHED_RESET_ON_FORK, all CTDB child
processes will automatically have normal scheduling priority.
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Thu Sep 11 11:31:10 CEST 2014 on sn-devel-104
commit e6127a9eceb215e421ee56c09032bb1e81c8131e
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 9 19:01:55 2014 +1000
ctdb-daemon: Increment pending calls statistics correctly
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_daemon.c | 2 +-
ctdb/server/ctdb_lock_helper.c | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index fd5413b..4ae56a9 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -596,7 +596,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client,
struct ctdb_daemon_packet_wrap *w;
CTDB_INCREMENT_STAT(ctdb, total_calls);
- CTDB_DECREMENT_STAT(ctdb, pending_calls);
+ CTDB_INCREMENT_STAT(ctdb, pending_calls);
ctdb_db = find_ctdb_db(client->ctdb, c->db_id);
if (!ctdb_db) {
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 9e75359..13764c6 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -123,6 +123,8 @@ int main(int argc, char *argv[])
exit(1);
}
+ set_scheduler();
+
ppid = atoi(argv[1]);
write_fd = atoi(argv[2]);
lock_type = argv[3];
--
Samba Shared Repository
More information about the samba-cvs
mailing list