[pve-devel] r5791 - vzdump/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-04-06 07:15:22 +0200 (Wed, 06 Apr 2011)
New Revision: 5791

Modified:
   vzdump/trunk/ChangeLog
   vzdump/trunk/Makefile
   vzdump/trunk/VZDump.pm
   vzdump/trunk/changelog.Debian
   vzdump/trunk/vzdump
Log:
allow to specifiy ionice priority 8, which uses ionice 'idle'
sheduling class.



Modified: vzdump/trunk/ChangeLog
===================================================================
--- vzdump/trunk/ChangeLog	2011-04-06 04:49:10 UTC (rev 5790)
+++ vzdump/trunk/ChangeLog	2011-04-06 05:15:22 UTC (rev 5791)
@@ -1,3 +1,8 @@
+2011-04-06  Proxmox Support Team  <support at proxmox.com>
+
+	* vzdump (print_usage): allow to use ionice idle scheduling
+	class (ionice > 7)
+
 2011-02-23  Proxmox Support Team  <support at proxmox.com>
 
 	* VZDump.pm (get_lvm_mapping): accept lowercase unit (M and

Modified: vzdump/trunk/Makefile
===================================================================
--- vzdump/trunk/Makefile	2011-04-06 04:49:10 UTC (rev 5790)
+++ vzdump/trunk/Makefile	2011-04-06 05:15:22 UTC (rev 5791)
@@ -13,7 +13,7 @@
 
 VERSION=1.2
 PACKAGE=vzdump
-PKGREL=11
+PKGREL=12
 
 #ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 #RPMARCH:=$(shell rpm --eval %_build_arch)

Modified: vzdump/trunk/VZDump.pm
===================================================================
--- vzdump/trunk/VZDump.pm	2011-04-06 04:49:10 UTC (rev 5790)
+++ vzdump/trunk/VZDump.pm	2011-04-06 05:15:22 UTC (rev 5791)
@@ -312,7 +312,7 @@
 	    $res->{script} = $1;
 	} elsif ($line =~ m/bwlimit:\s*(\d+)\s*$/) {
 	    $res->{bwlimit} = int($1);
-	} elsif ($line =~ m/ionice:\s*([0-7])\s*$/) {
+	} elsif ($line =~ m/ionice:\s*([0-8])\s*$/) {
 	    $res->{ionice} = int($1);
 	} elsif ($line =~ m/lockwait:\s*(\d+)\s*$/) {
 	    $res->{lockwait} = int($1);

Modified: vzdump/trunk/changelog.Debian
===================================================================
--- vzdump/trunk/changelog.Debian	2011-04-06 04:49:10 UTC (rev 5790)
+++ vzdump/trunk/changelog.Debian	2011-04-06 05:15:22 UTC (rev 5791)
@@ -1,3 +1,10 @@
+vzdump (1.2-12) unstable; urgency=low
+
+  * allow to specifiy ionice priority 8, which uses ionice 'idle'
+    sheduling class.
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 06 Apr 2011 07:13:22 +0200
+
 vzdump (1.2-11) unstable; urgency=low
 
   * fix lvm volume scan (allow lowercase unit 'm')

Modified: vzdump/trunk/vzdump
===================================================================
--- vzdump/trunk/vzdump	2011-04-06 04:49:10 UTC (rev 5790)
+++ vzdump/trunk/vzdump	2011-04-06 05:15:22 UTC (rev 5791)
@@ -95,7 +95,7 @@
     print STDERR "\t--lockwait MINUTES\tmaximal time to wait for the global lock\n";
     print STDERR "\t--stopwait MINUTES\tmaximal time to wait until a VM is stopped\n";
     print STDERR "\t--bwlimit KBPS\t\tlimit I/O bandwidth; KBytes per second\n";
-    print STDERR "\t--ionice PRI\t\tset ionice priority (0-7)\n\n";
+    print STDERR "\t--ionice PRI\t\tset ionice priority (0-8)\n\n";
 
     print STDERR "\n";
 }
@@ -159,7 +159,11 @@
 
 eval {
     if (defined($opts->{ionice})) {
-	PVE::VZDump::run_command (undef, "ionice -c2 -n$opts->{ionice} -p $$");
+	if ($opts->{ionice} > 7) {
+	    PVE::VZDump::run_command (undef, "ionice -c3 -p $$");
+	} else {
+	    PVE::VZDump::run_command (undef, "ionice -c2 -n$opts->{ionice} -p $$");
+	}
     }
     $vzdump->exec_backup(); 
 };
@@ -220,8 +224,9 @@
     
 --bwlimit KBPS          limit I/O bandwidth; KBytes per second
 
---ionice PRI            set ionice priority (0-7). default is 7 (lowest
-                        priority).
+--ionice PRI            set ionice priority (0-8). default is 7 (lowest 'best
+                        effort' priority). Value 8 uses the ionice
+                        'idle' scheduling class.
 
 --lockwait MINUTES      maximal time to wait for the global
                         lock. vzdump uses a global lock file to make