[Cluster-devel] conga/ricci/modules/storage LVM.cpp
kupcevic at sourceware.org
kupcevic at sourceware.org
Tue Jan 16 17:05:28 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2007-01-16 17:05:27
Modified files:
ricci/modules/storage: LVM.cpp
Log message:
Fix for 222223 (deactivate LV before removal)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LVM.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- conga/ricci/modules/storage/LVM.cpp 2006/12/12 13:11:51 1.10
+++ conga/ricci/modules/storage/LVM.cpp 2007/01/16 17:05:27 1.11
@@ -589,8 +589,8 @@
LVM::lvremove(const String& path)
{
vector<String> args;
- args.push_back("lvremove");
- args.push_back("--force");
+ args.push_back("lvchange");
+ args.push_back("-an");
args.push_back(path);
String out, err;
@@ -598,8 +598,28 @@
if (utils::execute(LVM_BIN_PATH, args, out, err, status, false))
throw command_not_found_error_msg(LVM_BIN_PATH);
if (status != 0)
- throw String("lvremove failed");
- utils::clear_cache();
+ throw String("Unable to deactivate LV (might be in use by other cluster nodes)");
+
+ try {
+ args.clear();
+ args.push_back("lvremove");
+ args.push_back("--force");
+ args.push_back(path);
+
+ if (utils::execute(LVM_BIN_PATH, args, out, err, status, false))
+ throw command_not_found_error_msg(LVM_BIN_PATH);
+ if (status != 0)
+ throw String("lvremove failed");
+ utils::clear_cache();
+ } catch ( ... ) {
+ args.clear();
+ args.push_back("lvchange");
+ args.push_back("-ay");
+ args.push_back(path);
+ utils::execute(LVM_BIN_PATH, args, out, err, status, false);
+ utils::clear_cache();
+ throw;
+ }
}
void
More information about the Cluster-devel
mailing list