[pve-devel] r6514 - in pve-cluster/trunk: . data data/PVE debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-22 08:15:43 +0200 (Mon, 22 Aug 2011)
New Revision: 6514

Modified:
   pve-cluster/trunk/Makefile
   pve-cluster/trunk/data/ChangeLog
   pve-cluster/trunk/data/PVE/Cluster.pm
   pve-cluster/trunk/debian/changelog
Log:
  * fixes for rrdcached
  
  * fix cfs_plug_link_getattr



Modified: pve-cluster/trunk/Makefile
===================================================================
--- pve-cluster/trunk/Makefile	2011-08-22 05:22:56 UTC (rev 6513)
+++ pve-cluster/trunk/Makefile	2011-08-22 06:15:43 UTC (rev 6514)
@@ -2,7 +2,7 @@
 
 PACKAGE=pve-cluster
 PKGVER=1.0
-PKGREL=6
+PKGREL=7
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

Modified: pve-cluster/trunk/data/ChangeLog
===================================================================
--- pve-cluster/trunk/data/ChangeLog	2011-08-22 05:22:56 UTC (rev 6513)
+++ pve-cluster/trunk/data/ChangeLog	2011-08-22 06:15:43 UTC (rev 6514)
@@ -1,5 +1,8 @@
 2011-08-22  Proxmox Support Team  <support at proxmox.com>
 
+	* PVE/Cluster.pm (create_rrd_graph): only use daemon if socket
+	exists.
+
 	* PVE/pvecm (delnode): test if we have quorum. 
 
 	* src/cfs-plug-link.c (cfs_plug_link_getattr): set read-only if we

Modified: pve-cluster/trunk/data/PVE/Cluster.pm
===================================================================
--- pve-cluster/trunk/data/PVE/Cluster.pm	2011-08-22 05:22:56 UTC (rev 6513)
+++ pve-cluster/trunk/data/PVE/Cluster.pm	2011-08-22 06:15:43 UTC (rev 6514)
@@ -566,13 +566,17 @@
 
     $cf = "AVERAGE" if !$cf;
 
-    my ($start, $step, $names, $data) = 
-	RRDs::fetch($rrd, $cf,
-		    "-s" => $req_start,
-		    "-e" => $ctime - 1,
-		    "-r" => $reso,
-		    "--daemon" => "unix:/var/run/rrdcached.sock");
+    my @args = (
+	"-s" => $req_start,
+	"-e" => $ctime - 1,
+	"-r" => $reso,
+	);
 
+    my $socket = "/var/run/rrdcached.sock";
+    push @args, "--daemon" => "unix:$socket" if -S $socket;
+
+    my ($start, $step, $names, $data) = RRDs::fetch($rrd, $cf, @args);
+
     my $err = RRDs::error;
     die "RRD error: $err\n" if $err;
     
@@ -625,7 +629,6 @@
     my ($reso, $count) = @{$setup->{$timeframe}};
 
     my @args = (
-	"--daemon" => "unix:/var/run/rrdcached.sock",	    
 	"--imgformat" => "PNG",
 	"--border" => 0,
 	"--height" => 200,
@@ -634,6 +637,9 @@
 	"--end" => 'now' ,
 	);
 
+    my $socket = "/var/run/rrdcached.sock";
+    push @args, "--daemon" => "unix:$socket" if -S $socket;
+
     my @ids = PVE::Tools::split_list($ds);
 
     my @coldef = ('#00ddff', '#ff0000');

Modified: pve-cluster/trunk/debian/changelog
===================================================================
--- pve-cluster/trunk/debian/changelog	2011-08-22 05:22:56 UTC (rev 6513)
+++ pve-cluster/trunk/debian/changelog	2011-08-22 06:15:43 UTC (rev 6514)
@@ -1,3 +1,11 @@
+pve-cluster (1.0-7) unstable; urgency=low
+
+  * fixes for rrdcached
+  
+  * fix cfs_plug_link_getattr
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 22 Aug 2011 08:15:16 +0200
+
 pve-cluster (1.0-6) unstable; urgency=low
 
   * removed pvecert binray (use pvecm instead)