changed si.basic.mem property to si.instancetype (small, large, xlarg…

…e) in spotinstances.conf file
nimbusproject · Aug 5, 2010 · 332434e · 332434e
1 parent efa8d13
commit 332434e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/service/service/java/source/etc/workspace-service/other/main.conflocator.xml b/service/service/java/source/etc/workspace-service/other/main.conflocator.xml
@@ -136,4 +136,11 @@
 
     </bean>
 
+    <bean id="elasticSettings"
+          class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+        <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/elastic/elastic.conf" />
+        <property name="placeholderPrefix" value="$ELASTIC{" />
+    </bean>
+
 </beans>
diff --git a/service/service/java/source/etc/workspace-service/other/main.xml b/service/service/java/source/etc/workspace-service/other/main.xml
@@ -558,7 +558,7 @@
         <constructor-arg ref="nimbus-rm.loglevels" />
         <constructor-arg ref="nimbus-rm.home.instance"/>
         <constructor-arg ref="nimbus-rm.home.group"/>
-        <constructor-arg value="$SI{si.basic.minprice}" />        
+        <constructor-arg value="$SI{si.minprice}" />        
         <constructor-arg ref="nimbus-rm.si.pricingmodel" />
 
         <!-- set after object creation time to avoid circular dep -->
@@ -570,7 +570,7 @@
         <property name="maxUtilization"
                   value="$SI{async.policies.maxutilization}" />
         <property name="instanceMem"
-                  value="$SI{si.basic.mem}" />                                    
+                  value="$ELASTIC{memory.$SI{si.instancetype}}" />                                    
 
     </bean>
 

diff --git a/service/service/java/source/etc/workspace-service/spotinstances.conf b/service/service/java/source/etc/workspace-service/spotinstances.conf
@@ -61,15 +61,24 @@ si.pricingmodel=org.globus.workspace.async.pricingmodel.MaximizeUtilizationPrici
 # BASIC SPOT INSTANCE CONFIGURATION:
 ####################################
 
-# Defines the amount of memory (in MegaBytes) that
-# a Spot Instance of the basic type has
+# Defines the instance type that will become
+# available as spot instances
+# 
+# The supported instance types are:
+# small, large and xlarge.
+#
+# The amount of memory for each instance type
+# is defined in the elastic.conf file.
+#
+# Currently, Nimbus only supports one type
+# of Spot Instance type per site.
 
-si.basic.mem=128
+si.instancetype=small
 
 # Defines the minimum price (in allocation units) per minute
-# that a Spot Instance of the basic type can cost
+# that a Spot Instance can cost
 
-si.basic.minprice=0.1
+si.minprice=0.1
 
 
 #############################
@@ -115,4 +124,4 @@ async.policies.minreservedmem=256
 #
 # * reservedMem = (1 - maxUtilization)*usedMem/maxUtilization
 
-async.policies.maxutilization=0.7
+async.policies.maxutilization=0.7