SHDP-533 Fix MR minicluster test dirs

- Change cluster creation so that identifiers
  are properly handled to separate working
  directories which should allow logs to
  stay in place after test failures.

Author: jvalkeal

spring-hadoop-test/src/main/java/org/springframework/data/hadoop/test/support/HadoopClusterManager.java

@@ -91,7 +91,7 @@ public HadoopCluster getCluster(ClusterInfo clusterInfo) {
 			log.info("Building new cluster for ClusterInfo=" + clusterInfo);
 			try {
 				HadoopClusterFactoryBean fb = new HadoopClusterFactoryBean();
-				fb.setClusterId("hadoop-" + clusterInfo.hashCode());
+				fb.setClusterId("hadoop-" + clusterInfo.getId() + "-" + clusterInfo.hashCode());
 				fb.setAutoStart(true);
 				fb.afterPropertiesSet();
 				cluster = fb.getObject();

spring-hadoop-test/src/main/java/org/springframework/data/hadoop/test/support/StandaloneHadoopCluster.java

@@ -140,7 +140,7 @@ public void start() throws IOException {
 			log.info("Dfs cluster uri= " + fs.getUri());
 
 			mrClusterObject = MiniMRClusterCompat.instantiateCluster(this.getClass(),
-					nodes, config, fs, this.getClass().getClassLoader());
+					clusterName, nodes, config, fs, this.getClass().getClassLoader());
 
 			configuration = MiniMRClusterCompat.getConfiguration(mrClusterObject);
 

spring-hadoop-test/src/main/java/org/springframework/data/hadoop/test/support/compat/MiniMRClusterCompat.java

@@ -56,13 +56,14 @@ public abstract class MiniMRClusterCompat {
 	 * Instantiates a minimrcluster.
 	 *
 	 * @param caller the one who called this method
+	 * @param identifier the cluster identifier
 	 * @param nodes number of nodes
 	 * @param configuration passed configuration
 	 * @param fileSystem hdfs filesystem
 	 * @param classLoader the class loader
 	 * @return the cluster object
 	 */
-	public static Object instantiateCluster(Class<?> caller, int nodes,
+	public static Object instantiateCluster(Class<?> caller, String identifier, int nodes,
 			Configuration configuration, FileSystem fileSystem,
 			ClassLoader classLoader) {
 
@@ -78,8 +79,9 @@ public static Object instantiateCluster(Class<?> caller, int nodes,
 		log.info("Cluster classes resolved, factory=" + factoryClass + " legacy=" + legacyClass);
 
 		if (factoryClass != null) {
-			Method method = ReflectionUtils.findMethod(factoryClass, "create", Class.class, int.class, Configuration.class);
-			cluster = ReflectionUtils.invokeMethod(method, null, caller, nodes, configuration);
+			Method method = ReflectionUtils.findMethod(factoryClass, "create", Class.class, String.class, int.class,
+					Configuration.class);
+			cluster = ReflectionUtils.invokeMethod(method, null, caller, identifier, nodes, configuration);
 		} else if (legacyClass != null) {
 			Constructor<?> constructor = ClassUtils.getConstructorIfAvailable(legacyClass, int.class, String.class, int.class);
 			cluster = BeanUtils.instantiateClass(constructor, nodes, fileSystem.getUri().toString(), 1);