* [Cluster-devel] conga/ricci common/Variable.cpp docs/variables ...
@ 2006-07-12 18:15 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-07-12 18:15 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-12 18:15:10
Modified files:
ricci/common : Variable.cpp
ricci/docs : variables.html
ricci/modules/storage: ContentFS.h FSController.cpp MDRaid.cpp
ricci/ricci : Ricci.cpp
Log message:
ricci/Ricci.cpp
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Variable.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/docs/variables.html.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/ContentFS.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/MDRaid.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- conga/ricci/common/Variable.cpp 2006/05/23 17:45:38 1.4
+++ conga/ricci/common/Variable.cpp 2006/07/12 18:15:10 1.5
@@ -46,7 +46,7 @@
_mutable = (xml.get_attr("mutable") == "true");
- // _validator = Validator(xml); // incoming limits are not to be trusted anyhow
+ // _validator = Validator(xml); // incoming constraints are not to be trusted anyhow
string type(xml.get_attr("type"));
--- conga/ricci/docs/variables.html 2006/04/12 22:41:20 1.2
+++ conga/ricci/docs/variables.html 2006/07/12 18:15:10 1.3
@@ -5,15 +5,21 @@
<TITLE>Variables</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.2 (Linux)">
<META NAME="CREATED" CONTENT="20060410;13011800">
- <META NAME="CHANGED" CONTENT="20060412;18255000">
+ <META NAME="CHANGED" CONTENT="20060626;16203200">
</HEAD>
<BODY LANG="en-US" DIR="LTR">
<P><var/> represents a variable. <BR>It has ???name???, ???type???
and ???mutable??? attributes. Optionally, dependent on ???type???, it
might have ???value??? attribute as well. If variable is ???mutable???,
-it will have constraints (constraints depend on ???type???).
+it will have constraints (constraints depend on ???type???). <BR>Besides
+constraints, conditionals can be present as well:<BR> - If a variable
+has an if=???bool_var_name??? attribute, it is to be used only if
+boolean variable named ???bool_var_name??? is set to ???true???.<BR>
+- If a variable has an ifnot=???bool_var_name??? attribute, it is to
+be used only if boolean variable named ???bool_var_name??? is set to
+???false???.</P>
+<P>Types:
</P>
-<P>Types:</P>
<UL>
<LI><P>int</P>
<UL>
--- conga/ricci/modules/storage/ContentFS.h 2006/03/10 17:50:11 1.2
+++ conga/ricci/modules/storage/ContentFS.h 2006/07/12 18:15:10 1.3
@@ -44,7 +44,6 @@
std::string _name;
-
};
--- conga/ricci/modules/storage/FSController.cpp 2006/03/10 17:50:11 1.2
+++ conga/ricci/modules/storage/FSController.cpp 2006/07/12 18:15:10 1.3
@@ -24,6 +24,7 @@
#include "FSController.h"
#include "ExtendedFS.h"
#include "SwapFS.h"
+//#include "GlobalFS.h"
#include "utils.h"
@@ -37,16 +38,15 @@
return counting_auto_ptr<Content>(new ExtendedFS(path));
} catch ( ... ) {}
try {
- return counting_auto_ptr<Content>(new SwapFS(path));
+ // return counting_auto_ptr<Content>(new GlobalFS(path));
} catch ( ... ) {}
try {
- // return counting_auto_ptr<ContentFS>(new gfs(path));
+ return counting_auto_ptr<Content>(new SwapFS(path));
} catch ( ... ) {}
throw string("not FS");
}
-
std::list<counting_auto_ptr<ContentTemplate> >
FSController::get_available_fss()
{
@@ -56,10 +56,10 @@
cnts.push_back(counting_auto_ptr<ContentTemplate>(new ExtendedFSTemplate()));
} catch ( ... ) {}
try {
- cnts.push_back(counting_auto_ptr<ContentTemplate>(new SwapFSTemplate()));
+ // cnts.push_back(counting_auto_ptr<ContentTemplate>(new GlobalFSTemplate()));
} catch ( ... ) {}
try {
- // return counting_auto_ptr<ContentTemplate>(new gfsTemplate(path));
+ cnts.push_back(counting_auto_ptr<ContentTemplate>(new SwapFSTemplate()));
} catch ( ... ) {}
return cnts;
@@ -75,6 +75,8 @@
string fs_type = cont_templ->attrs["fs_type"];
if (fs_type == "extended_fs")
create_extended_fs(bd->path(), cont_templ);
+ // else if (fs_type == "gfs")
+ // create_global_fs(bd->path(), cont_templ);
else if (fs_type == "swap")
create_swap_fs(bd->path(), cont_templ);
else
--- conga/ricci/modules/storage/MDRaid.cpp 2006/05/16 20:12:00 1.3
+++ conga/ricci/modules/storage/MDRaid.cpp 2006/07/12 18:15:10 1.4
@@ -116,7 +116,6 @@
{
bool active_old = _props.get("active").get_bool();
bool active_new = mp.props.get("active").get_bool();
-
if (active_old && !active_new)
// FIXME: umount FS before stoping, disabled for now (see constructor)
mdadm::stop_raid(_raid);
--- conga/ricci/ricci/Ricci.cpp 2006/06/19 22:41:51 1.10
+++ conga/ricci/ricci/Ricci.cpp 2006/07/12 18:15:10 1.11
@@ -152,13 +152,15 @@
} else if (function == "unauthenticate") {
if (!authenticated) {
// not authenticated
- success = RRC_NEED_AUTH;
+ // success = RRC_NEED_AUTH;
+ // unauthenticate should always succeed
+ success = RRC_SUCCESS;
} else {
// authenticated
resp = ricci_header(false);
success = RRC_SUCCESS;
remove_cert = true;
- } // authenticated
+ }
} else if (function == "list_modules") {
// available modules
@@ -176,7 +178,7 @@
resp.add_child(x);
}
success = RRC_SUCCESS;
- } // authenticated
+ }
} else if (function == "process_batch") {
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] conga/ricci common/Variable.cpp docs/variables ...
@ 2006-07-12 18:27 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-07-12 18:27 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-12 18:27:26
Modified files:
ricci/common : Variable.cpp
ricci/docs : variables.html
ricci/modules/storage: ContentFS.h FSController.cpp MDRaid.cpp
ricci/ricci : Ricci.cpp
Log message:
Revert previous patch
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Variable.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/docs/variables.html.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/ContentFS.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FSController.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/MDRaid.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- conga/ricci/common/Variable.cpp 2006/07/12 18:15:10 1.5
+++ conga/ricci/common/Variable.cpp 2006/07/12 18:27:26 1.6
@@ -46,7 +46,7 @@
_mutable = (xml.get_attr("mutable") == "true");
- // _validator = Validator(xml); // incoming constraints are not to be trusted anyhow
+ // _validator = Validator(xml); // incoming limits are not to be trusted anyhow
string type(xml.get_attr("type"));
--- conga/ricci/docs/variables.html 2006/07/12 18:15:10 1.3
+++ conga/ricci/docs/variables.html 2006/07/12 18:27:26 1.4
@@ -5,21 +5,15 @@
<TITLE>Variables</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.2 (Linux)">
<META NAME="CREATED" CONTENT="20060410;13011800">
- <META NAME="CHANGED" CONTENT="20060626;16203200">
+ <META NAME="CHANGED" CONTENT="20060412;18255000">
</HEAD>
<BODY LANG="en-US" DIR="LTR">
<P><var/> represents a variable. <BR>It has ???name???, ???type???
and ???mutable??? attributes. Optionally, dependent on ???type???, it
might have ???value??? attribute as well. If variable is ???mutable???,
-it will have constraints (constraints depend on ???type???). <BR>Besides
-constraints, conditionals can be present as well:<BR> - If a variable
-has an if=???bool_var_name??? attribute, it is to be used only if
-boolean variable named ???bool_var_name??? is set to ???true???.<BR>
-- If a variable has an ifnot=???bool_var_name??? attribute, it is to
-be used only if boolean variable named ???bool_var_name??? is set to
-???false???.</P>
-<P>Types:
+it will have constraints (constraints depend on ???type???).
</P>
+<P>Types:</P>
<UL>
<LI><P>int</P>
<UL>
--- conga/ricci/modules/storage/ContentFS.h 2006/07/12 18:15:10 1.3
+++ conga/ricci/modules/storage/ContentFS.h 2006/07/12 18:27:26 1.4
@@ -44,6 +44,7 @@
std::string _name;
+
};
--- conga/ricci/modules/storage/FSController.cpp 2006/07/12 18:15:10 1.3
+++ conga/ricci/modules/storage/FSController.cpp 2006/07/12 18:27:26 1.4
@@ -24,7 +24,6 @@
#include "FSController.h"
#include "ExtendedFS.h"
#include "SwapFS.h"
-//#include "GlobalFS.h"
#include "utils.h"
@@ -38,15 +37,16 @@
return counting_auto_ptr<Content>(new ExtendedFS(path));
} catch ( ... ) {}
try {
- // return counting_auto_ptr<Content>(new GlobalFS(path));
+ return counting_auto_ptr<Content>(new SwapFS(path));
} catch ( ... ) {}
try {
- return counting_auto_ptr<Content>(new SwapFS(path));
+ // return counting_auto_ptr<ContentFS>(new gfs(path));
} catch ( ... ) {}
throw string("not FS");
}
+
std::list<counting_auto_ptr<ContentTemplate> >
FSController::get_available_fss()
{
@@ -56,10 +56,10 @@
cnts.push_back(counting_auto_ptr<ContentTemplate>(new ExtendedFSTemplate()));
} catch ( ... ) {}
try {
- // cnts.push_back(counting_auto_ptr<ContentTemplate>(new GlobalFSTemplate()));
+ cnts.push_back(counting_auto_ptr<ContentTemplate>(new SwapFSTemplate()));
} catch ( ... ) {}
try {
- cnts.push_back(counting_auto_ptr<ContentTemplate>(new SwapFSTemplate()));
+ // return counting_auto_ptr<ContentTemplate>(new gfsTemplate(path));
} catch ( ... ) {}
return cnts;
@@ -75,8 +75,6 @@
string fs_type = cont_templ->attrs["fs_type"];
if (fs_type == "extended_fs")
create_extended_fs(bd->path(), cont_templ);
- // else if (fs_type == "gfs")
- // create_global_fs(bd->path(), cont_templ);
else if (fs_type == "swap")
create_swap_fs(bd->path(), cont_templ);
else
--- conga/ricci/modules/storage/MDRaid.cpp 2006/07/12 18:15:10 1.4
+++ conga/ricci/modules/storage/MDRaid.cpp 2006/07/12 18:27:26 1.5
@@ -116,6 +116,7 @@
{
bool active_old = _props.get("active").get_bool();
bool active_new = mp.props.get("active").get_bool();
+
if (active_old && !active_new)
// FIXME: umount FS before stoping, disabled for now (see constructor)
mdadm::stop_raid(_raid);
--- conga/ricci/ricci/Ricci.cpp 2006/07/12 18:15:10 1.11
+++ conga/ricci/ricci/Ricci.cpp 2006/07/12 18:27:26 1.12
@@ -152,15 +152,13 @@
} else if (function == "unauthenticate") {
if (!authenticated) {
// not authenticated
- // success = RRC_NEED_AUTH;
- // unauthenticate should always succeed
- success = RRC_SUCCESS;
+ success = RRC_NEED_AUTH;
} else {
// authenticated
resp = ricci_header(false);
success = RRC_SUCCESS;
remove_cert = true;
- }
+ } // authenticated
} else if (function == "list_modules") {
// available modules
@@ -178,7 +176,7 @@
resp.add_child(x);
}
success = RRC_SUCCESS;
- }
+ } // authenticated
} else if (function == "process_batch") {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-07-12 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-12 18:15 [Cluster-devel] conga/ricci common/Variable.cpp docs/variables kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-07-12 18:27 kupcevic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.