1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Commit Graph

69 Commits

Author SHA1 Message Date
Amitay Isaacs
e582d21537 ctdb-ib: Include system/wait.h for signal
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2016-07-05 10:53:15 +02:00
Amitay Isaacs
921d815da0 ctdb-transport: Replace ctdb_logging.h with common/logging.h
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
2015-11-16 00:46:15 +01:00
Amitay Isaacs
4647787773 ctdb-daemon: Separate prototypes for common client/server functions
This groups function prototypes for common client/server functions in
common/common.h and removes them from ctdb_private.h.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2015-10-30 02:00:27 +01:00
Amitay Isaacs
01c6c90e98 ctdb-daemon: Remove dependency on includes.h
Instead of includes.h, include the required header files explicitly.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2015-10-30 02:00:27 +01:00
Amitay Isaacs
2fdb332fad ctdb-daemon: Stop using tevent compatibility definitions
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2015-10-30 02:00:27 +01:00
Amitay Isaacs
47cddb699a ctdb-ib: Fix build for infiniband transport
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2015-10-27 04:15:15 +01:00
Stefan Metzmacher
53ff3e4f31 ctdb-ib: make sure the tevent_fd is removed before the fd is closed
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
2015-06-12 17:08:18 +02:00
Martin Schwenke
3105737c4b ctdb-logging: Change LogLevel to DEBUGLEVEL
For compatibility with current Samba debug.[ch].

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
2014-10-06 12:34:33 +02:00
Amitay Isaacs
d646df170c ctdb-build: Remove autoconf build files
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-06-20 23:38:09 +02:00
Amitay Isaacs
f2ef23cd5f ctdb-ib: Make infiniband transport compile again
Update included header files and fix compilation warnings.

  ib/ibwrapper.c: In function ‘ibw_stop’:
  ib/ibwrapper.c:1015:17: warning: comparison between ‘enum ibw_state_ctx’ and ‘enum ibw_state_conn’ [-Wenum-compare]
     if (ctx->state==IBWC_ERROR || ctx->state==IBWC_CONNECTED) {
                 ^
  ib/ibwrapper.c:1015:43: warning: comparison between ‘enum ibw_state_ctx’ and ‘enum ibw_state_conn’ [-Wenum-compare]
     if (ctx->state==IBWC_ERROR || ctx->state==IBWC_CONNECTED) {

The current logic just seems wrong.  The context of this line and the
error checking in ibw_disconnect() suggest that these comparisons
should use p->state rather than ctx->state, so do that.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
2014-05-29 03:35:54 +02:00
Amitay Isaacs
4392591555 Remove explicit include of lib/tevent/tevent.h.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit 0681014ca5ed2a9b56f63fdace7f894beccf8a9a)
2012-04-13 17:28:14 +10:00
Rusty Russell
f93440c4b7 event: Update events to latest Samba version 0.9.8
In Samba this is now called "tevent", and while we use the backwards
compatibility wrappers they don't offer EVENT_FD_AUTOCLOSE: that is now
a separate tevent_fd_set_auto_close() function.

This is based on Samba version 7f29f817fa.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>


(This used to be ctdb commit 85e5e760cc91eb3157d3a88996ce474491646726)
2010-08-18 09:16:31 +09:30
Ronnie Sahlberg
26e1486db7 Whitespace changes and using the CTDB_NO_MEMORY() macro changes to
the previous patch.

(This used to be ctdb commit d623ea7c04daa6349b42d50862843c9f86115488)
2009-05-21 11:49:16 +10:00
Sumit Bose
2fcedf6dac add missing checks on so far ignored return values
Most of these were found during a review by Jim Meyering <meyering@redhat.com>

(This used to be ctdb commit 3aee5ee1deb4a19be3bd3a4ce3abbe09de763344)
2009-05-21 11:22:21 +10:00
Martin Schwenke
2e87ed4e9d Test binaries now go in tests/bin and ctdb_test_env now adds this
directory to $PATH if local daemons are being used.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit a497010f67d6a8e68f4d6d7e516b88d2261b1062)
2009-01-09 18:15:06 +11:00
Andrew Tridgell
f6e53f433b merge from ronnie
(This used to be ctdb commit e7b57d38cf7255be823a223cf15b7526285b4f1c)
2008-02-04 20:07:15 +11:00
Andrew Tridgell
9d6ac0cf55 added debug constants to allow for better mapping to syslog levels
(This used to be ctdb commit 7ba8f1dde318eab03f4257e5a89fd23e7281e502)
2008-02-04 17:44:24 +11:00
Ronnie Sahlberg
e81e008a36 add missing ) in the IB transport (which i dont compile for)
(This used to be ctdb commit 7f7a184bae87d46bd589d11068b6443b007366b4)
2007-10-19 09:05:37 +10:00
Ronnie Sahlberg
fe7b5b4d85 add a stub restart method for IB
(This used to be ctdb commit d318504ad5a49dbdfa307be39ae88df839e6308d)
2007-10-19 09:04:52 +10:00
Andrew Tridgell
a4c96397f5 more merges for GPLv3 update
(This used to be ctdb commit b7be4ee6c9a670cdf148fd36b092c3991a554964)
2007-07-10 15:46:05 +10:00
Andrew Tridgell
32de198fd3 update lib/replace from samba4
(This used to be ctdb commit f0555484105668c01c21f56322992e752e831109)
2007-07-10 15:29:31 +10:00
Andrew Tridgell
be3a00bd73 clean out some more cruft
(This used to be ctdb commit ad16c5fe2748b48a6f6c79976359d56d9bed33f4)
2007-06-05 17:57:07 +10:00
Andrew Tridgell
c833b06a35 we need to listen at transport initialise stage to find our own node number
(This used to be ctdb commit 4a9455dfbe95e53884b46ad26dba0c33e3432ba9)
2007-05-30 14:46:14 +10:00
Andrew Tridgell
8ed48aac51 don't start the transport connecting to the other nodes until after the startup event script has run
(This used to be ctdb commit afca3cc74211aa2e18b1f74d36b2add8dffcfdc7)
2007-05-30 13:26:50 +10:00
Andrew Tridgell
2d9e0ad56a use /etc/services for ctdb
(This used to be ctdb commit 64bf6964ff33320c5351337c7f8ed4da5bd71275)
2007-05-29 15:15:00 +10:00
Peter Somogyi
67ae2ba4fb fixed prev. ibwrapper_test options
(This used to be ctdb commit 9a810d1f3201ec559d1f4f20ef4a42d7aa7090c4)
2007-04-26 17:09:30 +02:00
Peter Somogyi
0ce857fb2f ctdb/ib: swapped ibwrapper_tets options (-d, -a, -g)
(This used to be ctdb commit 4c11d4a990b792d3bc36e062c674e9573c6de821)
2007-04-26 17:06:36 +02:00
Peter Somogyi
4a106ade41 ctdb/ib: reduce debug output; allow not only ip
(This used to be ctdb commit 1942c21fe7b52f2b0c8f6895bdc7efd70505a9db)
2007-04-26 16:54:24 +02:00
Andrew Tridgell
c23d1694db merge from peter
(This used to be ctdb commit ddf390da2bceb5b3f431433aec424d99d98c05f4)
2007-04-26 15:28:13 +02:00
Peter Somogyi
206556a445 made ofed-1.0 (and 1.1) compatible + fixed warnings
(This used to be ctdb commit 43e4b83fc796b05baccfff6a34df398c821aa018)
2007-04-26 14:37:06 +02:00
Peter Somogyi
d244415d1e fixed ctdb/ib bug at reject event
reverted my suggestion in debug.c (based on my false error detection)

(This used to be ctdb commit 5c52c9f37639c65b551c10d1706c49653cd99742)
2007-04-23 12:45:14 +02:00
Peter Somogyi
e5f2e5e5eb - ctdb/ib minor bugfixes (error case)
- make ctdb capable of alternative connection (like ib) again, solved the fork problem
- do_debug memory overwrite bugfix (occured using ibwrapper_test with wrong address given)

(This used to be ctdb commit da0b84cda26d544f63841dfd770ed7ebad401944)
2007-04-20 14:26:19 +02:00
Peter Somogyi
c950e52858 Merged tridge's ctdb branch.
(This used to be ctdb commit d9046da5219144afe68f5a376243d998e7068ccd)
2007-04-19 15:52:08 +02:00
Andrew Tridgell
b79e29c779 - make he packet allocation routines take a mem_ctx, which allows
us to put memory directly in the right context, avoiding quite a few
  talloc_steal calls, and simplifying the code

- make the fetch lock code in the daemon fully async

(This used to be ctdb commit d98b4b4fcadad614861c0d44a3854d97b01d0f74)
2007-04-19 10:37:44 +10:00
Peter Somogyi
a32fa3451d merged tridge's branch
(This used to be ctdb commit 15e18293eaa5ddcd325395213014b5a4498ca309)
2007-04-16 16:28:29 +02:00
Andrew Tridgell
65cdf2297a private -> private_data for samba3
(This used to be ctdb commit 080b6901173afb2ad618dd0621876ff478c7d6e5)
2007-04-13 20:38:24 +10:00
Peter Somogyi
a003ee9571 ib: test scenario was wrong
it sent message in both (or all) direction at the same time. Now it measures normal pingpong.

(This used to be ctdb commit 26646aa91eb4e31efe6bacd92806ef7477b03bb7)
2007-03-29 18:46:02 +02:00
Peter Somogyi
1714c1ed0c ib: added external send queue to workaround downtime
Workaround is because I couldn't find a correct way in ib to reconnect cleanly (with queue kept) when destination is unreachable.
When connection is broken, all internal queue contents are being destroyed and reconnects automatically.
An "external" send queue is kept until the connection is up again for a dest node.

(This used to be ctdb commit 49cac6eafb9d9c80ef1c7f0388aa7786c8be6f24)
2007-02-26 11:59:20 +01:00
Peter Somogyi
199a5befb6 1st working ib integrated ctdb
TODO: bugfix of ctdb_bench (wants to sent via uninitialised connection - see bench_ring/dest)

(This used to be ctdb commit 61516461e9d45dc7ba87518d134894fed7d7b7cd)
2007-02-15 17:02:38 +01:00
Peter Somogyi
1c8bcd6f57 ib: a trivial approach of integration
TODO: bugfix (not yet complete, something happens differently than expected 
at tcpip when connection is refused in the beginning)

(This used to be ctdb commit 330d76fb91f717d4fb8d1be29c11ddf8c25a4f1c)
2007-02-14 18:58:20 +01:00
Peter Somogyi
8b6f1c39e7 Some minor changes before integrating ib...
(This used to be ctdb commit fa39ad5054de6e781ca980b9e24d22fa0c67e9ae)
2007-02-12 16:47:12 +01:00
Peter Somogyi
cae71b84d6 ib: fragment sent buf + many bugfixes
It came to light I have to fragment the send buffer in case destination's to fit receiver's buffers.
Additionally fixed many bugs.
Still testing.
+ TODO: clean code.

(This used to be ctdb commit 2f8876f09bc92169487cb077326579044560a121)
2007-02-08 19:06:14 +01:00
Peter Somogyi
36d53e5043 2 bugfixes
- ibw_stop handling
- ibw_send: < instead of <=

(This used to be ctdb commit 4774ef7e9e33f26745346b9bfe445d913f196e81)
2007-02-01 18:46:44 +01:00
Peter Somogyi
116bdb2590 Added overload test scenario + fixed 1 send queue bug.
TODO: externize debug level

(This used to be ctdb commit 98442ce3e2b3f09ca6736abfa0a8314cbdafaac7)
2007-01-30 18:47:26 +01:00
Peter Somogyi
4b8fe2af0a Fixed a side effect of previous revert.
(This used to be ctdb commit 08d013df5c6389c471036b20758463a844d33027)
2007-01-25 14:22:03 +01:00
Peter Somogyi
7c3982eb3b 1st "working" ib version.
TODO: stress test, variable size messages, flood

(This used to be ctdb commit 5f2a834fdcebe349aad095010ae01cce788b6482)
2007-01-25 11:01:59 +01:00
Peter Somogyi
9c114a3fc5 ibw: modified tridge's code - in my point of view
ibw_alloc_send and node-centric params are the basics of these important changes.
Also tried to avoid memcpy/memdup where it was possible.

(This used to be ctdb commit 9e8cb9b96c685288c04ee8b69a972f582cd3c904)
2007-01-05 18:13:35 +01:00
Peter Somogyi
00df320053 bugfix in ibw_send
Forgot to allow different message pointer than beginning of an allocated buf.

(This used to be ctdb commit de6f7ae87f17ab5c99f5cf369baa499cca96dee5)
2007-01-04 16:44:41 +01:00
Peter Somogyi
0397c81938 +1 ibw function +1 bugfix
Added ibw_cancel_send_buf to allow not sending the message after an ibw_alloc_send_buf.
Renamed "n" to "len" and changed its type.

(This used to be ctdb commit c8eb66296b99e528781ce05846aa86205830a1a0)
2007-01-03 17:37:47 +01:00
Peter Somogyi
11fb3ef3b5 Joining ctdb and ibwrapper (incomplete).
It compiles.

TODO: modify ctdb as well.

(This used to be ctdb commit a080b85a5d8e46946f8308bb6c76aa62b5a254db)
2007-01-02 18:16:39 +01:00