[haizea-commit] r572 - trunk/etc

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2009-02-15 19:39:10 -0600 (Sun, 15 Feb 2009)
New Revision: 572

Modified:
   trunk/etc/sample_multi.conf
   trunk/etc/sample_opennebula.conf
   trunk/etc/sample_trace.conf
Log:
Updated sample config file for TP1.3

Modified: trunk/etc/sample_multi.conf
===================================================================
--- trunk/etc/sample_multi.conf	2009-02-16 01:35:06 UTC (rev 571)
+++ trunk/etc/sample_multi.conf	2009-02-16 01:39:10 UTC (rev 572)
@@ -84,9 +84,12 @@
 nodes: 4
 resources: CPU,1;Mem,1024;Net (in),100;Net (out),100;Disk,20000
 imagetransfer-bandwidth: 100
-suspendresume-rate: 50
 status-message-interval: 15
 
+[common:scheduling]
+suspend-rate: 50
+resume-rate: 50
+
 [nobackfilling:scheduling]
 backfilling: off
 suspension: none

Modified: trunk/etc/sample_opennebula.conf
===================================================================
--- trunk/etc/sample_opennebula.conf	2009-02-16 01:35:06 UTC (rev 571)
+++ trunk/etc/sample_opennebula.conf	2009-02-16 01:39:10 UTC (rev 572)
@@ -9,39 +9,19 @@
 # Option: db
 # Required: Yes
 # Description: Location of OpenNebula database.
-db: /opt/nebula/ONE/var/one.db
+db: /usr/local/one/var/one.db
 
 # Option: onevm
 # Required: Yes
 # Description: Location of OpenNebula "onevm" command.
-onevm: /opt/nebula/ONE/bin/onevm
+onevm: /usr/local/one/bin/onevm
 
-# Option: wakeup-interval
-# Required: No (default is 60 seconds)
-# Description: Interval at which Haizea will wake up
-#   to process pending requests in OpenNebula.
-wakeup-interval: 60
 
-# Option: suspendresume-rate-estimate
-# Required: No (default is 32 MB/s)
-# Description: Rate at which VMs are estimated to suspend (in MB of
-#   memory per second)
-suspendresume-rate-estimate: 32
-
-# Option: non-schedulable-interval
-# Required: No (default is 10 seconds)
-# Description: The minimum amount of time that must pass between
-#   when a request is scheduled to when it can actually start.
-#   The default should be good for most configurations, but
-#   may need to be increased if you're dealing with exceptionally
-#   high loads.
-non-schedulable-interval: 10
-
-
 # ============================= #
 #                               #
 #         OTHER OPTIONS         #
 #       (see sample.conf        #
+#       or Haizea manual        #
 #       for description)        #
 #                               #
 # ============================= #
@@ -58,3 +38,7 @@
 migration: False
 transfer: none
 suspendresume-exclusion: global
+suspend-rate: 32
+resume-rate: 32
+wakeup-interval: 60
+non-schedulable-interval: 10

Modified: trunk/etc/sample_trace.conf
===================================================================
--- trunk/etc/sample_trace.conf	2009-02-16 01:35:06 UTC (rev 571)
+++ trunk/etc/sample_trace.conf	2009-02-16 01:39:10 UTC (rev 572)
@@ -101,12 +101,6 @@
 #   node where the images are stored.
 imagetransfer-bandwidth: 100
 
-# Option: suspendresume-rate
-# Required: Yes
-# Description: Rate at which VMs are assumed to suspend (in MB of
-#   memory per second)
-suspendresume-rate: 50
-
 # Option: status-message-interval
 # Required: No (default is to not show the message)
 # Description: If specified, the simulated clock will print a status
@@ -156,6 +150,18 @@
 #   - all: any lease can be suspended
 suspension: all
 
+# Option: suspend-rate
+# Required: Yes
+# Description: Rate at which VMs are assumed to suspend (in MB of
+#   memory per second)
+suspend-rate: 50
+
+# Option: resume-rate
+# Required: Yes
+# Description: Rate at which VMs are assumed to resume (in MB of
+#   memory per second)
+resume-rate: 50
+
 # Option: migration
 # Required: Yes
 # Description: Specifies whether leases can be migrated from one