cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2006-10-05 19:24 kupcevic
  0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2006-10-05 19:24 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-10-05 19:24:30

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	cluster module: start/stop qdiskd if needed

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2006/10/05 17:38:01	1.12
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2006/10/05 19:24:30	1.13
@@ -116,7 +116,6 @@
   
   if (stat.get_attr("cluster_version") == "4") {
     run_initd("ccsd", true, false);
-    cluster_conf = ClusterConf::get(); // ccsd should bring newest cluster.conf
     if (ClusterConf::is_cman(cluster_conf))
       try {
 	run_initd("cman", true, true);
@@ -144,6 +143,16 @@
       }
     }
     
+    bool use_qdisk = false;
+    cluster_conf = ClusterConf::get(); // ccsd should bring newest cluster.conf
+    for (list<XMLObject>::const_iterator iter = cluster_conf.children().begin();
+	 iter != cluster_conf.children().end();
+	 iter++)
+      if (iter->tag() == "quorumd")
+	use_qdisk = true;
+    
+    if (use_qdisk)
+      run_initd("qdiskd", true, false);
     run_initd("fenced", true, false);
     run_initd("clvmd", true, false);
     run_initd("gfs", true, false);
@@ -159,6 +168,10 @@
       run_chkconfig("cman", false);
       run_chkconfig("lock_gulmd", true);
     }
+    if (use_qdisk)
+      run_chkconfig("qdiskd", true);
+    else
+      run_chkconfig("qdiskd", false);
     run_chkconfig("fenced", true);
     run_chkconfig("clvmd", true);
     run_chkconfig("gfs", true);
@@ -199,9 +212,9 @@
 	 iter++)
       if (iter->tag() == "quorumd")
 	use_qdisk = true;
+    
     if (use_qdisk)
       run_initd("qdiskd", true, false);
-    
     run_initd("clvmd", true, false);
     run_initd("gfs", true, false);
     run_initd("gfs2", true, false);
@@ -246,6 +259,7 @@
     run_initd("gfs", false, false);
     run_initd("clvmd", false, false);
     run_initd("fenced", false, false);
+    run_initd("qdiskd", false, false);
     if (ClusterConf::is_cman(ClusterConf::get()))
       cman_leave();
     else
@@ -257,6 +271,7 @@
     run_chkconfig("ccsd", false);
     run_chkconfig("cman", false);
     run_chkconfig("lock_gulmd", false);
+    run_chkconfig("qdiskd", false);
     run_chkconfig("fenced", false);
     run_chkconfig("clvmd", false);
     run_chkconfig("gfs", false);



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2007-02-05 22:32 kupcevic
  0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2007-02-05 22:32 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	kupcevic at sourceware.org	2007-02-05 22:32:17

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	missing semicolon

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.16.2.1&r2=1.16.2.2

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 21:27:22	1.16.2.1
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 22:32:17	1.16.2.2
@@ -157,7 +157,7 @@
 {
   XMLObject cluster_conf(ClusterConf::get()); // bailout if cluster.conf not present
   XMLObject stat = status();
-  bool cman_cluster = ClusterConf::is_cman(cluster_conf)
+  bool cman_cluster = ClusterConf::is_cman(cluster_conf);
   
   if (stat.get_attr("cluster_version") == "4") {
     run_initd("ccsd", true, false);



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2007-02-05 22:38 rmccabe
  0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-02-05 22:38 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-02-05 22:38:07

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	missing semicolon..

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 19:52:44	1.17
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 22:38:06	1.18
@@ -157,7 +157,7 @@
 {
   XMLObject cluster_conf(ClusterConf::get()); // bailout if cluster.conf not present
   XMLObject stat = status();
-  bool cman_cluster = ClusterConf::is_cman(cluster_conf)
+  bool cman_cluster = ClusterConf::is_cman(cluster_conf);
   
   if (stat.get_attr("cluster_version") == "4") {
     run_initd("ccsd", true, false);



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2007-03-06  9:09 kupcevic
  0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2007-03-06  9:09 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2007-03-06 09:09:48

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.2&r2=1.15.2.3

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/01 00:31:20	1.15.2.2
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/06 09:09:48	1.15.2.3
@@ -42,6 +42,7 @@
 #define LSMOD_PATH            "/sbin/lsmod"
 #define MODPROBE_PATH         "/sbin/modprobe"
 #define CHKCONFIG_PATH        "/sbin/chkconfig"
+#define LVMCONF_PATH          "/usr/sbin/lvmconf"
 
 #define CMAN_LEAVE_TIMEOUT    "120"  // seconds (string)
 #define CLUMON_SYNC_TIME      8      // seconds
@@ -346,6 +347,15 @@
   
   if (purge_conf) {
     ClusterConf::purge_conf();
+    
+    // disable LVM cluster locking
+    try {
+      String out, err;
+      int status;
+      vector<String> args;
+      args.push_back("--disable-cluster");
+      utils::execute(LVMCONF_PATH, args, out, err, status, false);
+    } catch ( ... ) {}
   }
 }
 



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2007-03-06  9:13 kupcevic
  0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2007-03-06  9:13 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	kupcevic at sourceware.org	2007-03-06 09:13:12

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.16.2.2&r2=1.16.2.3

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 22:32:17	1.16.2.2
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/06 09:13:11	1.16.2.3
@@ -42,6 +42,7 @@
 #define LSMOD_PATH            "/sbin/lsmod"
 #define MODPROBE_PATH         "/sbin/modprobe"
 #define CHKCONFIG_PATH        "/sbin/chkconfig"
+#define LVMCONF_PATH          "/usr/sbin/lvmconf"
 
 #define CMAN_LEAVE_TIMEOUT    "120"  // seconds (string)
 #define CLUMON_SYNC_TIME      8      // seconds
@@ -346,6 +347,15 @@
   
   if (purge_conf) {
     ClusterConf::purge_conf();
+    
+    // disable LVM cluster locking
+    try {
+      String out, err;
+      int status;
+      vector<String> args;
+      args.push_back("--disable-cluster");
+      utils::execute(LVMCONF_PATH, args, out, err, status, false);
+    } catch ( ... ) {}
   }
 }
 



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp
@ 2007-03-06  9:15 kupcevic
  0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2007-03-06  9:15 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2007-03-06 09:15:02

Modified files:
	ricci/modules/cluster: ClusterStatus.cpp 

Log message:
	Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 22:38:06	1.18
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/03/06 09:15:01	1.19
@@ -42,6 +42,7 @@
 #define LSMOD_PATH            "/sbin/lsmod"
 #define MODPROBE_PATH         "/sbin/modprobe"
 #define CHKCONFIG_PATH        "/sbin/chkconfig"
+#define LVMCONF_PATH          "/usr/sbin/lvmconf"
 
 #define CMAN_LEAVE_TIMEOUT    "120"  // seconds (string)
 #define CLUMON_SYNC_TIME      8      // seconds
@@ -346,6 +347,15 @@
   
   if (purge_conf) {
     ClusterConf::purge_conf();
+    
+    // disable LVM cluster locking
+    try {
+      String out, err;
+      int status;
+      vector<String> args;
+      args.push_back("--disable-cluster");
+      utils::execute(LVMCONF_PATH, args, out, err, status, false);
+    } catch ( ... ) {}
   }
 }
 



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-03-06  9:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-06  9:13 [Cluster-devel] conga/ricci/modules/cluster ClusterStatus.cpp kupcevic
  -- strict thread matches above, loose matches on Subject: below --
2007-03-06  9:15 kupcevic
2007-03-06  9:09 kupcevic
2007-02-05 22:38 rmccabe
2007-02-05 22:32 kupcevic
2006-10-05 19:24 kupcevic

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).