cluster: RHEL6 - rgmanager: Header cleanup

Lon Hohberger lon at fedoraproject.org
Tue Feb 1 18:10:28 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5203d9eefe530a13525dc32d9f48568fbabfd495
Commit:        5203d9eefe530a13525dc32d9f48568fbabfd495
Parent:        ca924c428bbf149531f896b52c9ba6f1597c634b
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Aug 25 13:32:19 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Feb 1 12:29:56 2011 -0500

rgmanager: Header cleanup

Resolves: rhbz#634277

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/include/res-ocf.h  |    1 +
 rgmanager/include/resgroup.h |    3 +++
 rgmanager/include/reslist.h  |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/rgmanager/include/res-ocf.h b/rgmanager/include/res-ocf.h
index 557e128..cc65a4d 100644
--- a/rgmanager/include/res-ocf.h
+++ b/rgmanager/include/res-ocf.h
@@ -48,5 +48,6 @@
 #define RS_MIGRATE	(13)
 #define RS_RECONFIG	(14)
 #define RS_STATUS_INQUIRY (15)	/** Quick status */
+#define RS_CONVALESCE	(16)
 
 #endif
diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h
index c639315..13b4dae 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -100,6 +100,7 @@ extern size_t rg_state_t_version_sizes[];
 #define RG_FREEZE	  23
 #define RG_UNFREEZE	  24
 #define RG_STATUS_INQUIRY 25
+#define RG_CONVALESCE	  26
 #define RG_NONE		  999
 
 const char *rg_req_str(int req);
@@ -129,6 +130,8 @@ int handle_start_remote_req(char *svcName, int req);
 
 /* Resource group flags (for now) */
 #define RG_FLAG_FROZEN			(1<<0)	/** Resource frozen */
+#define RG_FLAG_PARTIAL			(1<<1)	/** One or more non-critical
+						    resources offline */
 
 const char *rg_state_str(int val);
 const char *rg_flag_str(int val);
diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h
index 8376478..142fce6 100644
--- a/rgmanager/include/reslist.h
+++ b/rgmanager/include/reslist.h
@@ -28,7 +28,7 @@
 				  resource class if you delete it from
 				  the configuration */
 #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */
-#define RF_NON_CRITCIAL (1<<10) /** stop this resource if it fails */
+#define RF_NON_CRITICAL (1<<10) /** stop this resource if it fails */
 
 
 


More information about the cluster-commits mailing list