cluster: STABLE3 - rgmanager: Header cleanup

Lon Hohberger lon at fedoraproject.org
Fri Sep 24 22:19:25 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2459ceb0301b492d1d3e53a4d008e27c9328f093
Commit:        2459ceb0301b492d1d3e53a4d008e27c9328f093
Parent:        4d7ec682cb842d00f29af3ca3b82a6488c6a7bb3
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Aug 25 13:32:19 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Sep 24 18:17:21 2010 -0400

rgmanager: Header cleanup

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 3afbce2..21d7ab6 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -106,6 +106,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);
@@ -135,6 +136,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 ba47c44..ed22a3b 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