[Cluster-devel] conga/ricci/modules/storage FSController.cpp

[Cluster-devel] conga/ricci/modules/storage FSController.cpp

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-09-26 03:20:47

Modified files:
	ricci/modules/storage: FSController.cpp 

Log message:
	storage module: add full GFS1/2 support, and detection of multiple other filesystems (so they don't get overwriten)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/ricci/modules/storage/FSController.cpp	2006/09/26 03:02:57	1.6
+++ conga/ricci/modules/storage/FSController.cpp	2006/09/26 03:20:47	1.7
@@ -24,6 +24,9 @@
 #include "FSController.h"
 #include "ExtendedFS.h"
 #include "SwapFS.h"
+#include "GFS1.h"
+#include "GFS2.h"
+#include "UnsupportedFS.h"
 #include "utils.h"
 
 
@@ -37,9 +40,15 @@
     return counting_auto_ptr<Content>(new ExtendedFS(path));
   } catch ( ... ) {}
   try {
+    return counting_auto_ptr<Content>(new GFS1(path));
+  } catch ( ... ) {}
+  try {
+    return counting_auto_ptr<Content>(new GFS2(path));
+  } catch ( ... ) {}
+  try {
     return counting_auto_ptr<Content>(new SwapFS(path));
   } catch ( ... ) {}
-  throw String("not FS");
+  return counting_auto_ptr<Content>(new UnsupportedFS(path));
 }
 
 std::list<counting_auto_ptr<ContentTemplate> > 
@@ -51,6 +60,12 @@
     cnts.push_back(counting_auto_ptr<ContentTemplate>(new ExtendedFSTemplate()));
   } catch ( ... ) {}
   try {
+    cnts.push_back(counting_auto_ptr<ContentTemplate>(new GFS1Template()));
+  } catch ( ... ) {}
+  try {
+    cnts.push_back(counting_auto_ptr<ContentTemplate>(new GFS2Template()));
+  } catch ( ... ) {}
+  try {
     cnts.push_back(counting_auto_ptr<ContentTemplate>(new SwapFSTemplate()));
   } catch ( ... ) {}
   
@@ -67,6 +82,10 @@
   String fs_type = cont_templ->attrs["fs_type"];
   if (fs_type == ExtendedFS::PRETTY_NAME)
     create_extended_fs(bd->path(), cont_templ);
+  else if (fs_type == GFS1::PRETTY_NAME)
+    create_GFS1(bd->path(), cont_templ);
+  else if (fs_type == GFS2::PRETTY_NAME)
+    create_GFS2(bd->path(), cont_templ);
   else if (fs_type == SwapFS::PRETTY_NAME)
     create_swap_fs(bd->path(), cont_templ);
   else

[Cluster-devel] conga/ricci/modules/storage FSController.cpp

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-27 15:46:34

Modified files:
	ricci/modules/storage: FSController.cpp 

Log message:
	work around temporary brew breakage..

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.1&r2=1.7.2.2

--- conga/ricci/modules/storage/FSController.cpp	2007/06/25 19:10:55	1.7.2.1
+++ conga/ricci/modules/storage/FSController.cpp	2007/06/27 15:46:33	1.7.2.2
@@ -28,7 +28,10 @@
 #include "UnsupportedFS.h"
 #include "utils.h"
 #include <errno.h>
+
+#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN
 #include <libgroup.h>
+#endif
 
 using namespace std;
 
@@ -36,6 +39,7 @@
 FSController::get_fs_group_ids(const String& name)
 {
 	list<String> members;
+#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN
 	group_data_t fsgroup;
 
 	if (group_get_group(2, name.c_str(), &fsgroup) != 0)
@@ -51,6 +55,7 @@
 			throw String("invalid node id");
     	members.push_back(String(buf));
 	}
+#endif
 	return members;
 }
 

[Cluster-devel] conga/ricci/modules/storage FSController.cpp

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-08 21:58:58

Modified files:
	ricci/modules/storage: FSController.cpp 

Log message:
	brew still has an old version of libgroup.h

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.3&r2=1.7.2.4

--- conga/ricci/modules/storage/FSController.cpp	2007/08/08 21:09:44	1.7.2.3
+++ conga/ricci/modules/storage/FSController.cpp	2007/08/08 21:58:58	1.7.2.4
@@ -28,7 +28,10 @@
 #include "UnsupportedFS.h"
 #include "utils.h"
 #include <errno.h>
+
+#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN
 #include <libgroup.h>
+#endif
 
 using namespace std;
 
@@ -36,6 +39,7 @@
 FSController::get_fs_group_ids(const String& name)
 {
 	list<String> members;
+#ifdef MY_BUILD_SYSTEM_IS_NOT_BROKEN
 	group_data_t fsgroup;
 
 	if (group_get_group(2, name.c_str(), &fsgroup) != 0)
@@ -51,6 +55,7 @@
 			throw String("invalid node id");
     	members.push_back(String(buf));
 	}
+#endif
 	return members;
 }