cluster: RHEL57 - rgmanager: Add path to rhev-check.sh
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 7a1ce5f909bdf6aef032bf4874de9fe54a22ab25
Parent: 39a2ee8ab10b7d7117adb124a846da4a083b4af0
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Mar 4 16:07:34 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Mar 21 18:58:30 2011 -0400
rgmanager: Add path to rhev-check.sh
Resolves: rhbz#634225
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/utils/rhev-check.sh.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/rgmanager/src/utils/rhev-check.sh.in b/rgmanager/src/utils/rhev-check.sh.in
index 7baad17..ab27b7d 100644
--- a/rgmanager/src/utils/rhev-check.sh.in
+++ b/rgmanager/src/utils/rhev-check.sh.in
@@ -1,5 +1,8 @@
#!/bin/sh
+PATH="/usr/sbin:/sbin:/usr/bin:/bin"
+export PATH
+
MYNAME=`basename $0`
do_log()
13 years, 1 month
gfs2-utils: master - gfs2_convert exits with success without doing anything
by Abhijith Das
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: 8f79aadbc06e9edebad08157025fc28c8668ddf8
Parent: ae17f725f37fccaf59087994b54ffdcdb782fa81
Author: Abhijith Das <adas(a)redhat.com>
AuthorDate: Mon Mar 21 17:23:20 2011 -0500
Committer: Abhijith Das <adas(a)redhat.com>
CommitterDate: Mon Mar 21 17:23:20 2011 -0500
gfs2_convert exits with success without doing anything
This is a correction to the previous patch that worked only for
the default 4K blocksizes because the internal blocksize value
was not yet updated with the actual value from the ondisk gfs1
superblock.
Resolves: rhbz#688734
Signed-off-by: Abhi Das <adas(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 98876ae..64dfe32 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1502,7 +1502,6 @@ static int init(struct gfs2_sbd *sbp)
sbp->dinodes_alloced = 0; /* dinodes allocated - total them up later */
sbp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE;
sbp->bsize = sbp->sd_sb.sb_bsize;
- sbp->fssize = lseek(sbp->device_fd, 0, SEEK_END) / sbp->sd_sb.sb_bsize;
osi_list_init(&sbp->rglist);
if (compute_constants(sbp)) {
log_crit("Error: Bad constants (1)\n");
@@ -1518,6 +1517,7 @@ static int init(struct gfs2_sbd *sbp)
rindex_addr = be64_to_cpu(raw_gfs1_ondisk_sb.sb_rindex_di.no_addr);
sbp->bsize = sbp->sd_sb.sb_bsize;
+ sbp->fssize = lseek(sbp->device_fd, 0, SEEK_END) / sbp->sd_sb.sb_bsize;
sbp->sd_inptrs = (sbp->bsize - sizeof(struct gfs_indirect)) /
sizeof(uint64_t);
sbp->sd_diptrs = (sbp->bsize - sizeof(struct gfs_dinode)) /
13 years, 1 month
cluster: RHEL6 - gfs2_convert: exits with success without doing anything
by Abhijith Das
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 508b868e8c22a4dc454a406d9a1c0a32af94c21e
Parent: ecf02d5c3fac9cc8fbd4aa03f495a734c930e143
Author: Abhijith Das <adas(a)redhat.com>
AuthorDate: Mon Mar 21 11:35:46 2011 -0500
Committer: Abhijith Das <adas(a)redhat.com>
CommitterDate: Mon Mar 21 11:35:46 2011 -0500
gfs2_convert: exits with success without doing anything
A recent gfs2-utils patch added a sanity check (gfs2_check_range())
to the codepath of gfs1_ri_update() that's used by gfs2_convert.
This new check requires the value of sbp->fssize to be initialized
to a valid non-zero size, which gfs2_convert does not do. The check
fails and gfs2_convert bails out. This patch initializes sbp->fssize
to the device size and the check is successful and gfs2_convert runs
to completion as expected.
Resolves: rhbz#688734
Signed-off-by: Abhi Das <adas(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index e71a00c..2b8f487 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1498,6 +1498,7 @@ static int init(struct gfs2_sbd *sbp)
sbp->dinodes_alloced = 0; /* dinodes allocated - total them up later */
sbp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE;
sbp->bsize = sbp->sd_sb.sb_bsize;
+ sbp->fssize = lseek(sbp->device_fd, 0, SEEK_END) / sbp->sd_sb.sb_bsize;
osi_list_init(&sbp->rglist);
if (compute_constants(sbp)) {
log_crit("Error: Bad constants (1)\n");
13 years, 1 month
gfs2-utils: master - gfs2_convert: exits with success without doing anything
by Abhijith Das
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: ae17f725f37fccaf59087994b54ffdcdb782fa81
Parent: f6e1c345d7cce3d5ceedf2b19868b5d6a008ea2c
Author: Abhijith Das <adas(a)redhat.com>
AuthorDate: Mon Mar 21 11:27:55 2011 -0500
Committer: Abhijith Das <adas(a)redhat.com>
CommitterDate: Mon Mar 21 11:27:55 2011 -0500
gfs2_convert: exits with success without doing anything
A recent gfs2-utils patch added a sanity check (gfs2_check_range())
to the codepath of gfs1_ri_update() that's used by gfs2_convert.
This new check requires the value of sbp->fssize to be initialized
to a valid non-zero size, which gfs2_convert does not do. The check
fails and gfs2_convert bails out. This patch initializes sbp->fssize
to the device size and the check is successful and gfs2_convert runs
to completion as expected.
Resolves: rhbz#688734
Signed-off-by: Abhi Das <adas(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index b56eec2..98876ae 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1502,6 +1502,7 @@ static int init(struct gfs2_sbd *sbp)
sbp->dinodes_alloced = 0; /* dinodes allocated - total them up later */
sbp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE;
sbp->bsize = sbp->sd_sb.sb_bsize;
+ sbp->fssize = lseek(sbp->device_fd, 0, SEEK_END) / sbp->sd_sb.sb_bsize;
osi_list_init(&sbp->rglist);
if (compute_constants(sbp)) {
log_crit("Error: Bad constants (1)\n");
13 years, 1 month
cluster: RHEL6 - fence_rhevm: Update URL to RHEV-M REST API
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: ecf02d5c3fac9cc8fbd4aa03f495a734c930e143
Parent: 0c01f1dec0c264203ee9736dcf6958c992c2fc88
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Mar 21 09:06:36 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Mar 21 09:09:14 2011 +0100
fence_rhevm: Update URL to RHEV-M REST API
Resolves: rhbz#681674
---
fence/agents/rhevm/fence_rhevm.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index dea7283..6d8df4e 100755
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -89,7 +89,7 @@ def send_command(opt, command, method = "GET"):
else:
url = "http:"
- url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/rhevm-api-powershell/" + command
+ url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/rhevm-api/" + command
## send command through pycurl
c = pycurl.Curl()
13 years, 1 month
fence-agents: master - fence_rhevm: Update URL to RHEV-M REST API
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: e8253f37feb87c5f64db1c40f4c93fb27a248f34
Parent: 12db46382b4807b67076104b725adf9d9bb4d900
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Mar 21 09:06:36 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Mar 21 09:06:36 2011 +0100
fence_rhevm: Update URL to RHEV-M REST API
Resolves: rhbz#681674
---
fence/agents/rhevm/fence_rhevm.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index dea7283..6d8df4e 100755
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -89,7 +89,7 @@ def send_command(opt, command, method = "GET"):
else:
url = "http:"
- url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/rhevm-api-powershell/" + command
+ url += "//" + opt["-a"] + ":" + str(opt["-u"]) + "/rhevm-api/" + command
## send command through pycurl
c = pycurl.Curl()
13 years, 1 month
cluster: RHEL6 - config: Add DRBD 0.8.3 metadata back to schema
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 0c01f1dec0c264203ee9736dcf6958c992c2fc88
Parent: 45738d2f92ecb881e77959756d5e9921fd3d1484
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Mar 18 10:53:20 2011 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Mar 18 14:24:04 2011 -0400
config: Add DRBD 0.8.3 metadata back to schema
Resolves: rhbz#680172
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
Reviewed-by: Fabio Di Nitto <fdinitto(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 821fb82..ae85bd4 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -2247,6 +2247,43 @@ To validate your cluster.conf against this schema, run:
</element>
</define>
+
+ <define name="DRBD">
+ <element name="drbd" rha:description="This is a DRBD resource.">
+ <choice>
+ <group>
+ <!-- rgmanager specific stuff -->
+ <attribute name="ref" rha:description="Reference to existing drbd resource in the resources section."/>
+ </group>
+ <group>
+ <attribute name="name" rha:description="Cluster resource name"/>
+ <attribute name="resource" rha:description="DRBD resource name"/>
+ </group>
+ </choice>
+ <optional>
+ <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/>
+ </optional>
+ <optional>
+ <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/>
+ </optional>
+ <optional>
+ <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/>
+ </optional>
+ <optional>
+ <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
+ </optional>
+ <optional>
+ <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+ </optional>
+ <optional>
+ <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+ </optional>
+ <optional>
+ <ref name="CHILDREN"/>
+ </optional>
+ </element>
+ </define>
+
<define name="CHILDREN">
<zeroOrMore>
<choice>
@@ -2275,6 +2312,7 @@ To validate your cluster.conf against this schema, run:
<ref name="ORALISTENER"/>
<ref name="FS"/>
<ref name="ORACLEDB"/>
+ <ref name="DRBD"/>
<ref name="RESOURCEACTION"/>
</choice>
</zeroOrMore>
13 years, 1 month
cluster: RHEL6 - fence-agents: Accept other values for "true"
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 45738d2f92ecb881e77959756d5e9921fd3d1484
Parent: d15ab26309f1d357387ebbd8a205c6416d0398e7
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Mon Feb 28 15:46:58 2011 -0500
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Fri Mar 18 15:40:55 2011 +0100
fence-agents: Accept other values for "true"
Resolves: rhbz#679502
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
fence/agents/lib/fencing.py.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 93756cc..f7c565a 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -603,7 +603,7 @@ def process_input(avail_opt):
if all_opt[name]["getopt"].endswith(":"):
opt["-"+all_opt[name]["getopt"].rstrip(":")] = value
- elif ((value == "1") or (value.lower() == "yes")):
+ elif ((value == "1") or (value.lower() == "yes") or (value.lower() == "on") or (value.lower() == "true")):
opt["-"+all_opt[name]["getopt"]] = "1"
return opt
13 years, 1 month
fence-agents: master - fence-agents: Accept other values for "true"
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 12db46382b4807b67076104b725adf9d9bb4d900
Parent: dbf856abb9f162c75a01ea3add308920434ef6c9
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Mon Feb 28 15:46:58 2011 -0500
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Fri Mar 18 15:33:42 2011 +0100
fence-agents: Accept other values for "true"
Resolves: rhbz#679502
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
fence/agents/lib/fencing.py.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 65f88da..4e5eb18 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -603,7 +603,7 @@ def process_input(avail_opt):
if all_opt[name]["getopt"].endswith(":"):
opt["-"+all_opt[name]["getopt"].rstrip(":")] = value
- elif ((value == "1") or (value.lower() == "yes")):
+ elif ((value == "1") or (value.lower() == "yes") or (value.lower() == "on") or (value.lower() == "true")):
opt["-"+all_opt[name]["getopt"]] = "1"
return opt
13 years, 1 month
cluster: RHEL6 - cman init: increse the default timeout waiting for quorum
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: d15ab26309f1d357387ebbd8a205c6416d0398e7
Parent: 4fe4dbb1e1261b2cfa471840134f27043f683385
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Mar 16 16:24:27 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Mar 18 09:40:05 2011 +0100
cman init: increse the default timeout waiting for quorum
not all clusters can achieve quorum in 20 seconds. Bump to 45 by default.
Value is still tunable via sysconfig entry.
Resolves: rhbz#688201
Acked-by: Lon Hohberger <lhh(a)redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 2 +-
cman/init.d/cman.init.defaults.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 972a814..b821826 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -83,7 +83,7 @@ fi
# startup quorum is needed by many other applications, so we may as
# well wait here. If CMAN_QUORUM_TIMEOUT is zero, quorum will
# be ignored.
-[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=20
+[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=45
# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
# cluster member before calling cman_tool leave during shutdown.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 5e70c0e..05c3bc7 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -10,7 +10,7 @@
# startup quorum is needed by many other applications, so we may as
# well wait here. If CMAN_QUORUM_TIMEOUT is zero, quorum will
# be ignored.
-#CMAN_QUORUM_TIMEOUT=20
+#CMAN_QUORUM_TIMEOUT=45
# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
# cluster member before calling cman_tool leave during shutdown.
13 years, 1 month