Author: vinayakumarb
Date: Wed Jun 11 12:20:48 2014
New Revision: 1601869
URL: http://svn.apache.org/r1601869
Log:
Merged revision(s) 1601144-1601868, 1598456-1601149 from hadoop/common/trunk
Added:
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-azure/
- copied from r1601868, hadoop/common/trunk/hadoop-tools/hadoop-azure/
Modified:
hadoop/common/branches/HDFS-5442/ (props changed)
hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml
Propchange: hadoop/common/branches/HDFS-5442/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1601151-1601868
Modified: hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml Wed Jun 11 12:20:48
2014
@@ -65,6 +65,8 @@
<!-- define the protobuf JAR version -->
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
+
+ <zookeeper.version>3.4.6</zookeeper.version>
</properties>
<dependencyManagement>
@@ -307,6 +309,12 @@
<artifactId>hadoop-openstack</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-azure</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -672,7 +680,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
+ <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline -->
@@ -696,7 +704,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
+ <version>${zookeeper.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
@@ -766,6 +774,12 @@
<version>1.8</version>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.windowsazure.storage</groupId>
+ <artifactId>microsoft-windowsazure-storage-sdk</artifactId>
+ <version>0.6.0</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified:
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
Wed Jun 11 12:20:48 2014
@@ -376,7 +376,7 @@ public class TestGridMixClasses {
/*
* test LoadSortComparator
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testLoadJobLoadSortComparator() throws Exception {
LoadJob.LoadSortComparator test = new LoadJob.LoadSortComparator();
@@ -409,7 +409,7 @@ public class TestGridMixClasses {
/*
* test SpecGroupingComparator
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testGridmixJobSpecGroupingComparator() throws Exception {
GridmixJob.SpecGroupingComparator test = new
GridmixJob.SpecGroupingComparator();
@@ -452,7 +452,7 @@ public class TestGridMixClasses {
/*
* test CompareGridmixJob only equals and compare
*/
- @Test (timeout=10000)
+ @Test (timeout=30000)
public void testCompareGridmixJob() throws Exception {
Configuration conf = new Configuration();
Path outRoot = new Path("target");
@@ -478,7 +478,7 @@ public class TestGridMixClasses {
/*
* test ReadRecordFactory. should read all data from inputstream
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testReadRecordFactory() throws Exception {
// RecordFactory factory, InputStream src, Configuration conf
@@ -589,7 +589,7 @@ public class TestGridMixClasses {
/*
* test LoadRecordReader. It class reads data from some files.
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testLoadJobLoadRecordReader() throws Exception {
LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader();
Configuration conf = new Configuration();
@@ -652,7 +652,7 @@ public class TestGridMixClasses {
* test LoadReducer
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testLoadJobLoadReducer() throws Exception {
LoadJob.LoadReducer test = new LoadJob.LoadReducer();
@@ -772,7 +772,7 @@ public class TestGridMixClasses {
/*
* test SerialJobFactory
*/
- @Test (timeout=40000)
+ @Test (timeout=120000)
public void testSerialReaderThread() throws Exception {
Configuration conf = new Configuration();
@@ -833,7 +833,7 @@ public class TestGridMixClasses {
* test SleepMapper
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- @Test (timeout=10000)
+ @Test (timeout=30000)
public void testSleepMapper() throws Exception {
SleepJob.SleepMapper test = new SleepJob.SleepMapper();
@@ -878,7 +878,7 @@ public class TestGridMixClasses {
/*
* test SleepReducer
*/
- @Test (timeout=1000)
+ @Test (timeout=3000)
public void testSleepReducer() throws Exception {
Configuration conf = new Configuration();
conf.setInt(JobContext.NUM_REDUCES, 2);
Modified:
hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml
(original)
+++ hadoop/common/branches/HDFS-5442/hadoop-tools/hadoop-tools-dist/pom.xml Wed
Jun 11 12:20:48 2014
@@ -85,6 +85,12 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-azure</artifactId>
+ <scope>compile</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-sls</artifactId>
<scope>compile</scope>
</dependency>
Modified: hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-5442/hadoop-tools/pom.xml Wed Jun 11 12:20:48
2014
@@ -42,6 +42,7 @@
<module>hadoop-pipes</module>
<module>hadoop-openstack</module>
<module>hadoop-sls</module>
+ <module>hadoop-azure</module>
</modules>
<build>
