From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/ricci common/Variable.cpp docs/variables ...
Date: 12 Jul 2006 18:15:11 -0000 [thread overview]
Message-ID: <20060712181511.19867.qmail@sourceware.org> (raw)
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") {
next reply other threads:[~2006-07-12 18:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-12 18:15 kupcevic [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-07-12 18:27 [Cluster-devel] conga/ricci common/Variable.cpp docs/variables kupcevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060712181511.19867.qmail@sourceware.org \
--to=kupcevic@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.