Implemented writing instancetype in storm.yaml, for use by scheduler as

needed.

Author: KasperMadsen

src/dk/kaspergsm/stormdeploy/LaunchNodeThread.java

@@ -2,9 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.RunNodesException;
+import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.scriptbuilder.domain.Statement;
@@ -60,6 +61,7 @@ public LaunchNodeThread(ComputeService compute, Configuration config, String ins
 		// Create initScript
 		_initScript = new ArrayList<Statement>();
 		_initScript.add(exec("echo \"" + daemons.toString() + "\" > ~/daemons"));
+		_initScript.add(exec("echo \"" + instanceType.toString() + "\" > ~/.instance-type"));
 		if (zkMyId != null)
 			_initScript.addAll(Zookeeper.writeZKMyIds(_username, zkMyId));
 
@@ -88,7 +90,18 @@ public void run() {
 											.runScript(new StatementList(_initScript))
 											.overrideLoginCredentials(Tools.getPrivateKeyCredentials(_username))
 											.authorizePublicKey(Tools.getPublicKey())).build());
-		} catch (RunNodesException ex) {
+		} catch (NoSuchElementException ex) {
+			// happens often when hardwareId is not found. List all possible hardware types
+			if (ex.getMessage().toLowerCase().contains("hardwareid") && ex.getMessage().toLowerCase().contains("not found")) {
+				log.error("You have specified unknown hardware profile. Here follows a list of supported profiles: ");
+				Set<? extends Hardware> availableHardware = _compute.listHardwareProfiles();
+				for (Hardware h : availableHardware) {
+					log.info(h.toString());
+				}
+			} else {
+				log.error("Problem: ", ex);	
+			}
+		} catch (Exception ex) {
 			log.error("Problem launching instance", ex);
 		}
 	}

src/dk/kaspergsm/stormdeploy/configurations/Storm.java

@@ -1,12 +1,15 @@
 package dk.kaspergsm.stormdeploy.configurations;
 
 import static org.jclouds.scriptbuilder.domain.Statements.exec;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.jclouds.scriptbuilder.domain.Statement;
+
 import dk.kaspergsm.stormdeploy.Tools;
 
 
@@ -28,10 +31,20 @@ public static List<Statement> configure(String hostname, List<String> zkNodesHos
 		ArrayList<Statement> st = new ArrayList<Statement>();
 		st.add(exec("cd ~/storm/conf/"));
 		st.add(exec("touch storm.yaml"));
+		
+		// Add nimbus.host
 		st.add(exec("echo nimbus.host: \"" + hostname + "\" >> storm.yaml"));
+		
+		// Add storm.zookeeper.servers
 		st.add(exec("echo storm.zookeeper.servers: >> storm.yaml"));
 		for (int i = 1; i <= zkNodesHostname.size(); i++)
 			st.add(exec("echo - \"" + zkNodesHostname.get(i-1) + "\" >> storm.yaml"));
+		
+		// Add supervisor metadata
+		st.add(exec("echo supervisor.scheduler.meta: >> storm.yaml"));
+		st.add(exec("instancetype=$(cat ~/.instance-type)"));
+		st.add(exec("echo \"  instancetype: \\\"$instancetype\\\"\" >> storm.yaml"));
+		
 		return st;
 	}