From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
:100644 100644 5667ace... 0ee692e... M exec/votequorum.c
:100644 100644 6e9eb55... e31c2ad... M include/corosync/ipc_votequorum.h
:100644 100644 d7b5eea... 6483171... M include/corosync/votequorum.h
:100644 100644 180c283... 20dbda2... M man/votequorum_getinfo.3.in
:100644 100644 033012f... 7b0a94f... M test/testvotequorum1.c
:100644 100644 d237433... fb9ecf4... M tools/corosync-quorumtool.c
exec/votequorum.c | 2 +-
include/corosync/ipc_votequorum.h | 2 +-
include/corosync/votequorum.h | 2 +-
man/votequorum_getinfo.3.in | 2 +-
test/testvotequorum1.c | 4 ++--
tools/corosync-quorumtool.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/exec/votequorum.c b/exec/votequorum.c
index 5667ace..0ee692e 100644
--- a/exec/votequorum.c
+++ b/exec/votequorum.c
@@ -2028,7 +2028,7 @@ static void message_handler_req_lib_votequorum_getinfo (void *conn, const void *
res_lib_votequorum_getinfo.flags |= VOTEQUORUM_INFO_AUTO_TIE_BREAKER;
}
if (allow_downscale) {
- res_lib_votequorum_getinfo.flags |= VOTEQUORUM_INFO_LEAVE_REMOVE;
+ res_lib_votequorum_getinfo.flags |= VOTEQUORUM_INFO_ALLOW_DOWNSCALE;
}
if (node->flags & NODE_FLAGS_QDEVICE_REGISTERED) {
res_lib_votequorum_getinfo.flags |= VOTEQUORUM_INFO_QDEVICE_REGISTERED;
diff --git a/include/corosync/ipc_votequorum.h b/include/corosync/ipc_votequorum.h
index 6e9eb55..e31c2ad 100644
--- a/include/corosync/ipc_votequorum.h
+++ b/include/corosync/ipc_votequorum.h
@@ -122,7 +122,7 @@ struct res_lib_votequorum_status {
#define VOTEQUORUM_INFO_WAIT_FOR_ALL 4
#define VOTEQUORUM_INFO_LAST_MAN_STANDING 8
#define VOTEQUORUM_INFO_AUTO_TIE_BREAKER 16
-#define VOTEQUORUM_INFO_LEAVE_REMOVE 32
+#define VOTEQUORUM_INFO_ALLOW_DOWNSCALE 32
#define VOTEQUORUM_INFO_QDEVICE_REGISTERED 64
#define VOTEQUORUM_INFO_QDEVICE_ALIVE 128
#define VOTEQUORUM_INFO_QDEVICE_CAST_VOTE 256
diff --git a/include/corosync/votequorum.h b/include/corosync/votequorum.h
index d7b5eea..6483171 100644
--- a/include/corosync/votequorum.h
+++ b/include/corosync/votequorum.h
@@ -47,7 +47,7 @@ typedef uint64_t votequorum_handle_t;
#define VOTEQUORUM_INFO_WAIT_FOR_ALL 4
#define VOTEQUORUM_INFO_LAST_MAN_STANDING 8
#define VOTEQUORUM_INFO_AUTO_TIE_BREAKER 16
-#define VOTEQUORUM_INFO_LEAVE_REMOVE 32
+#define VOTEQUORUM_INFO_ALLOW_DOWNSCALE 32
#define VOTEQUORUM_INFO_QDEVICE_REGISTERED 64
#define VOTEQUORUM_INFO_QDEVICE_ALIVE 128
#define VOTEQUORUM_INFO_QDEVICE_CAST_VOTE 256
diff --git a/man/votequorum_getinfo.3.in b/man/votequorum_getinfo.3.in
index 180c283..20dbda2 100644
--- a/man/votequorum_getinfo.3.in
+++ b/man/votequorum_getinfo.3.in
@@ -79,7 +79,7 @@ The flags are defined as:
#define VOTEQUORUM_INFO_WAIT_FOR_ALL 4
#define VOTEQUORUM_INFO_LAST_MAN_STANDING 8
#define VOTEQUORUM_INFO_AUTO_TIE_BREAKER 16
-#define VOTEQUORUM_INFO_LEAVE_REMOVE 32
+#define VOTEQUORUM_INFO_ALLOW_DOWNSCALE 32
#define VOTEQUORUM_INFO_QDEVICE_REGISTERED 64
#define VOTEQUORUM_INFO_QDEVICE_ALIVE 128
#define VOTEQUORUM_INFO_QDEVICE_CAST_VOTE 256
diff --git a/test/testvotequorum1.c b/test/testvotequorum1.c
index 033012f..7b0a94f 100644
--- a/test/testvotequorum1.c
+++ b/test/testvotequorum1.c
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
if (info.flags & VOTEQUORUM_INFO_WAIT_FOR_ALL) printf("WaitForAll ");
if (info.flags & VOTEQUORUM_INFO_LAST_MAN_STANDING) printf("LastManStanding ");
if (info.flags & VOTEQUORUM_INFO_AUTO_TIE_BREAKER) printf("AutoTieBreaker ");
- if (info.flags & VOTEQUORUM_INFO_LEAVE_REMOVE) printf("LeaveRemove ");
+ if (info.flags & VOTEQUORUM_INFO_ALLOW_DOWNSCALE) printf("AllowDownscale ");
printf("\n");
}
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
if (info.flags & VOTEQUORUM_INFO_WAIT_FOR_ALL) printf("WaitForAll ");
if (info.flags & VOTEQUORUM_INFO_LAST_MAN_STANDING) printf("LastManStanding ");
if (info.flags & VOTEQUORUM_INFO_AUTO_TIE_BREAKER) printf("AutoTieBreaker ");
- if (info.flags & VOTEQUORUM_INFO_LEAVE_REMOVE) printf("LeaveRemove ");
+ if (info.flags & VOTEQUORUM_INFO_ALLOW_DOWNSCALE) printf("AllowDownscale ");
printf("\n");
}
}
diff --git a/tools/corosync-quorumtool.c b/tools/corosync-quorumtool.c
index d237433..fb9ecf4 100644
--- a/tools/corosync-quorumtool.c
+++ b/tools/corosync-quorumtool.c
@@ -433,7 +433,7 @@ static int display_quorum_data(int is_quorate, uint32_t nodeid,
if (info.flags & VOTEQUORUM_INFO_WAIT_FOR_ALL) printf("WaitForAll ");
if (info.flags & VOTEQUORUM_INFO_LAST_MAN_STANDING) printf("LastManStanding ");
if (info.flags & VOTEQUORUM_INFO_AUTO_TIE_BREAKER) printf("AutoTieBreaker ");
- if (info.flags & VOTEQUORUM_INFO_LEAVE_REMOVE) printf("LeaveRemove ");
+ if (info.flags & VOTEQUORUM_INFO_ALLOW_DOWNSCALE) printf("AllowDownscale ");
if (info.flags & VOTEQUORUM_INFO_QDEVICE_REGISTERED) {
printf("Qdevice ");
display_qdevice = 1;
--
1.7.7.6
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
