Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
-struct srvid_request_data {
+struct ctdb_disable_message {
uint32_t pnn;
uint64_t srvid;
uint32_t pnn;
uint64_t srvid;
};
/* the wire representation for a tcp tickle array */
};
/* the wire representation for a tcp tickle array */
bool banning_credits_on_fail)
{
uint32_t *nodes = NULL;
bool banning_credits_on_fail)
{
uint32_t *nodes = NULL;
- struct srvid_request_data dtr;
+ struct ctdb_disable_message dtr;
TDB_DATA data;
int i;
uint32_t *rebalance_nodes = rec->force_rebalance_nodes;
TDB_DATA data;
int i;
uint32_t *rebalance_nodes = rec->force_rebalance_nodes;
/* Disable for 60 seconds. This can be a tunable later if
* necessary.
*/
/* Disable for 60 seconds. This can be a tunable later if
* necessary.
*/
for (i = 0; i < talloc_array_length(nodes); i++) {
if (ctdb_client_send_message(rec->ctdb, nodes[i],
CTDB_SRVID_DISABLE_TAKEOVER_RUNS,
for (i = 0; i < talloc_array_length(nodes); i++) {
if (ctdb_client_send_message(rec->ctdb, nodes[i],
CTDB_SRVID_DISABLE_TAKEOVER_RUNS,
banning_credits_on_fail ? rec : NULL);
/* Reenable takeover runs and IP checks on other nodes */
banning_credits_on_fail ? rec : NULL);
/* Reenable takeover runs and IP checks on other nodes */
for (i = 0; i < talloc_array_length(nodes); i++) {
if (ctdb_client_send_message(rec->ctdb, nodes[i],
CTDB_SRVID_DISABLE_TAKEOVER_RUNS,
for (i = 0; i < talloc_array_length(nodes); i++) {
if (ctdb_client_send_message(rec->ctdb, nodes[i],
CTDB_SRVID_DISABLE_TAKEOVER_RUNS,
TDB_DATA data,
struct ctdb_op_state *op_state)
{
TDB_DATA data,
struct ctdb_op_state *op_state)
{
- struct srvid_request_data *r;
+ struct ctdb_disable_message *r;
uint32_t timeout;
TDB_DATA result;
int32_t ret = 0;
/* Validate input data */
uint32_t timeout;
TDB_DATA result;
int32_t ret = 0;
/* Validate input data */
- if (data.dsize != sizeof(struct srvid_request_data)) {
+ if (data.dsize != sizeof(struct ctdb_disable_message)) {
DEBUG(DEBUG_ERR,(__location__ " Wrong size for data :%lu "
"expecting %lu\n", (long unsigned)data.dsize,
(long unsigned)sizeof(struct ctdb_srvid_message)));
DEBUG(DEBUG_ERR,(__location__ " Wrong size for data :%lu "
"expecting %lu\n", (long unsigned)data.dsize,
(long unsigned)sizeof(struct ctdb_srvid_message)));
- r = (struct srvid_request_data *)data.dptr;
- timeout = r->data;
+ r = (struct ctdb_disable_message *)data.dptr;
+ timeout = r->timeout;
ret = ctdb_op_disable(op_state, ctdb->ev, timeout);
if (ret != 0) {
ret = ctdb_op_disable(op_state, ctdb->ev, timeout);
if (ret != 0) {
uint32_t pnn;
uint64_t reply_srvid;
struct ctdb_srvid_message request;
uint32_t pnn;
uint64_t reply_srvid;
struct ctdb_srvid_message request;
- struct srvid_request_data request_data;
+ struct ctdb_disable_message request_data;
struct srvid_reply_handler_data reply_data;
struct timeval tv;
struct srvid_reply_handler_data reply_data;
struct timeval tv;
} else {
request_data.pnn = pnn;
request_data.srvid = reply_srvid;
} else {
request_data.pnn = pnn;
request_data.srvid = reply_srvid;
- request_data.data = *arg;
+ request_data.timeout = *arg;
data.dptr = (uint8_t *)&request_data;
data.dsize = sizeof(request_data);
data.dptr = (uint8_t *)&request_data;
data.dsize = sizeof(request_data);