[Cluster-devel] conga/ricci Changelog TODO modules/storage/BD. ...

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-12 19:47:51

Modified files:
	ricci          : Changelog TODO 
	ricci/modules/storage: BD.h LV.cpp LV.h 

Log message:
	storage module: remove snapshot_usage from state_ind

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Changelog.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/TODO.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/BD.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LV.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/LV.h.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/ricci/Changelog	2006/07/05 21:44:07	1.1
+++ conga/ricci/Changelog	2006/07/12 19:47:50	1.2
@@ -0,0 +1,6 @@
+
+2006-07-12  Stanko Kupcevic <kupcevic at redhat.com> 
+  * ricci: unauthenticate() should always succeed
+  * storage module: remove snapshot_usage from state_ind (snapshot usage shouldn't affect state_ind)
+
+
--- conga/ricci/TODO	2006/07/05 21:44:07	1.1
+++ conga/ricci/TODO	2006/07/12 19:47:50	1.2
@@ -5,7 +5,6 @@
 
 
 Ricci:
-	- unauthenticate() should always succeed
 	- make ricci-auth secure (check Ryan's patch, and ask for review)
 
 
@@ -24,7 +23,6 @@
  - Storage
 	- add scan_scsi_bus()
 	- remove mirror copy progress from state_ind 
-	- remove snapshot_usage from state_ind
 	- try to first umount all targets on mapper removal, remount on failure
 	- swap label on partitions
 	- hidden content to partition_template
--- conga/ricci/modules/storage/BD.h	2006/03/10 17:50:11	1.2
+++ conga/ricci/modules/storage/BD.h	2006/07/12 19:47:50	1.3
@@ -64,7 +64,7 @@
   virtual ~BD();
   
   std::string path() const;
-  std::string state_ind() const;
+  virtual std::string state_ind() const;
   virtual long long size() const;
   std::string mapper_id() const;
   std::string mapper_type() const;
--- conga/ricci/modules/storage/LV.cpp	2006/06/28 20:09:08	1.3
+++ conga/ricci/modules/storage/LV.cpp	2006/07/12 19:47:50	1.4
@@ -163,6 +163,21 @@
 
 
 
+string 
+LV::state_ind() const
+{
+  Props tmp_props(_props);
+  
+  // remove "snapshot_usage_percent" as its change shouldn't affect state_ind
+  tmp_props.set(Variable("snapshot_usage_percent", (long long) 0));
+  
+  XMLObject t;
+  t.add_child(tmp_props.xml());
+  t.add_child(content->xml());
+  
+  return utils::hash_str(generateXML(t) + path() + _mapper_id);
+}
+
 counting_auto_ptr<BD> 
 LV::apply(const BDParsed& bd_parsed)
 {
--- conga/ricci/modules/storage/LV.h	2006/03/10 17:50:11	1.2
+++ conga/ricci/modules/storage/LV.h	2006/07/12 19:47:50	1.3
@@ -36,6 +36,8 @@
   LV(const std::string& path);
   virtual ~LV();
   
+  virtual std::string state_ind() const;
+  
   virtual void remove();
   
   virtual counting_auto_ptr<BD> apply(const BDParsed& bd);  // return new bd