You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2012/05/15 19:36:04 UTC
svn commit: r1338855 - in /incubator/tashi/site:
docs/documentation-options.html xdocs/documentation-options.xml
Author: stroucki
Date: Tue May 15 19:36:04 2012
New Revision: 1338855
URL: http://svn.apache.org/viewvc?rev=1338855&view=rev
Log:
documentation: update options
Modified:
incubator/tashi/site/docs/documentation-options.html
incubator/tashi/site/xdocs/documentation-options.xml
Modified: incubator/tashi/site/docs/documentation-options.html
URL: http://svn.apache.org/viewvc/incubator/tashi/site/docs/documentation-options.html?rev=1338855&r1=1338854&r2=1338855&view=diff
==============================================================================
--- incubator/tashi/site/docs/documentation-options.html (original)
+++ incubator/tashi/site/docs/documentation-options.html Tue May 15 19:36:04 2012
@@ -351,11 +351,6 @@ table.options td {
<td>How many seconds should the node manager wait between registering with the cluster manager?</td>
</tr>
<tr>
-<td>infoFile</td>
-<td>/var/tmp/nm.dat</td>
-<td>Where the node manager places pickled run-time information for crash or restart recovery</td>
-</tr>
-<tr>
<td>clusterManagerHost</td>
<td>localhost</td>
<td>What host to connect to in order to find the cluster manager</td>
@@ -367,7 +362,7 @@ table.options td {
</tr>
<tr>
<td>statsInterval</td>
-<td>0.0</td>
+<td>0</td>
<td>How often should the node manager output per-VM statistics using the publisher</td>
</tr>
<tr>
@@ -379,7 +374,7 @@ table.options td {
</tr>
<tr>
<td>qemuBin</td>
-<td>/usr/local/bin/qemu-system-x86_64</td>
+<td>/usr/bin/kvm</td>
<td>The location of the Qemu/Kqemu/KVM binary to be used</td>
</tr>
<tr>
@@ -388,8 +383,13 @@ table.options td {
<td>A location into which the Qemu backend places per-VM control information</td>
</tr>
<tr>
+<td>statsInterval</td>
+<td>0</td>
+<td>How often should per-VM statistics be collected</td>
+</tr>
+<tr>
<td>scratchDir</td>
-<td>/tmp/</td>
+<td>/tmp</td>
<td>Location where Qemu snapshot disk images can be placed</td>
</tr>
<tr>
@@ -398,8 +398,13 @@ table.options td {
<td>Volume group where host-local logical volumes can be allocated</td>
</tr>
<tr>
+<td>reservedMem</td>
+<td>512</td>
+<td>Memory to reserve for the host (in megabytes)</td>
+</tr>
+<tr>
<td>pollDelay</td>
-<td>1.0</td>
+<td>1</td>
<td>How often to check and see if a VM has exited</td>
</tr>
<tr>
@@ -409,12 +414,12 @@ table.options td {
</tr>
<tr>
<td>monitorTimeout</td>
-<td>60.0</td>
+<td>60</td>
<td>How long to wait before timing out on monitor command execution</td>
</tr>
<tr>
<td>migrateTimeout</td>
-<td>300.0</td>
+<td>300</td>
<td>How long to wait before timing out a live migration</td>
</tr>
<tr>
@@ -425,12 +430,17 @@ table.options td {
<tr>
<td>useMigrateArgument</td>
<td>False</td>
-<td>An option to allow the use of "migrate=True" as an argument to KVM -- requires a patch to KVM</td>
+<td>(DEPRECATED) An option to allow the use of "migrate=True" as an argument to KVM -- requires a patch to KVM</td>
</tr>
<tr>
-<td>statsInterval</td>
-<td>0.0</td>
-<td>How often to collect per-VM statistics</td>
+<td>suspendHandler</td>
+<td>gzip</td>
+<td>Machine state being saved will be piped through this program</td>
+</tr>
+<tr>
+<td>resumeHandler</td>
+<td>zcat</td>
+<td>Machine state being loaded will be piped through this program</td>
</tr>
<tr>
<td colspan="3">
Modified: incubator/tashi/site/xdocs/documentation-options.xml
URL: http://svn.apache.org/viewvc/incubator/tashi/site/xdocs/documentation-options.xml?rev=1338855&r1=1338854&r2=1338855&view=diff
==============================================================================
--- incubator/tashi/site/xdocs/documentation-options.xml (original)
+++ incubator/tashi/site/xdocs/documentation-options.xml Tue May 15 19:36:04 2012
@@ -281,11 +281,6 @@
<td>How many seconds should the node manager wait between registering with the cluster manager?</td>
</tr>
<tr>
-<td>infoFile</td>
-<td>/var/tmp/nm.dat</td>
-<td>Where the node manager places pickled run-time information for crash or restart recovery</td>
-</tr>
-<tr>
<td>clusterManagerHost</td>
<td>localhost</td>
<td>What host to connect to in order to find the cluster manager</td>
@@ -297,7 +292,7 @@
</tr>
<tr>
<td>statsInterval</td>
-<td>0.0</td>
+<td>0</td>
<td>How often should the node manager output per-VM statistics using the publisher</td>
</tr>
<tr>
@@ -309,7 +304,7 @@
</tr>
<tr>
<td>qemuBin</td>
-<td>/usr/local/bin/qemu-system-x86_64</td>
+<td>/usr/bin/kvm</td>
<td>The location of the Qemu/Kqemu/KVM binary to be used</td>
</tr>
<tr>
@@ -318,8 +313,13 @@
<td>A location into which the Qemu backend places per-VM control information</td>
</tr>
<tr>
+<td>statsInterval</td>
+<td>0</td>
+<td>How often should per-VM statistics be collected</td>
+</tr>
+<tr>
<td>scratchDir</td>
-<td>/tmp/</td>
+<td>/tmp</td>
<td>Location where Qemu snapshot disk images can be placed</td>
</tr>
<tr>
@@ -328,8 +328,13 @@
<td>Volume group where host-local logical volumes can be allocated</td>
</tr>
<tr>
+<td>reservedMem</td>
+<td>512</td>
+<td>Memory to reserve for the host (in megabytes)</td>
+</tr>
+<tr>
<td>pollDelay</td>
-<td>1.0</td>
+<td>1</td>
<td>How often to check and see if a VM has exited</td>
</tr>
<tr>
@@ -339,12 +344,12 @@
</tr>
<tr>
<td>monitorTimeout</td>
-<td>60.0</td>
+<td>60</td>
<td>How long to wait before timing out on monitor command execution</td>
</tr>
<tr>
<td>migrateTimeout</td>
-<td>300.0</td>
+<td>300</td>
<td>How long to wait before timing out a live migration</td>
</tr>
<tr>
@@ -355,12 +360,17 @@
<tr>
<td>useMigrateArgument</td>
<td>False</td>
-<td>An option to allow the use of "migrate=True" as an argument to KVM -- requires a patch to KVM</td>
+<td>(DEPRECATED) An option to allow the use of "migrate=True" as an argument to KVM -- requires a patch to KVM</td>
</tr>
<tr>
-<td>statsInterval</td>
-<td>0.0</td>
-<td>How often to collect per-VM statistics</td>
+<td>suspendHandler</td>
+<td>gzip</td>
+<td>Machine state being saved will be piped through this program</td>
+</tr>
+<tr>
+<td>resumeHandler</td>
+<td>zcat</td>
+<td>Machine state being loaded will be piped through this program</td>
</tr>
<tr>
<td colspan="3">