Author: stevel
Date: Fri Aug 21 19:24:25 2009
New Revision: 806688
URL: http://svn.apache.org/viewvc?rev=806688&view=rev
Log:
HADOOP-6194: Service lifecycle
Modified:
hadoop/common/branches/HADOOP-6194/ (props changed)
hadoop/common/branches/HADOOP-6194/CHANGES.txt (contents, props changed)
hadoop/common/branches/HADOOP-6194/src/contrib/ec2/ (props changed)
hadoop/common/branches/HADOOP-6194/src/docs/ (props changed)
hadoop/common/branches/HADOOP-6194/src/java/ (props changed)
hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/HADOOP-6194/src/native/packageNativeHadoop.sh
hadoop/common/branches/HADOOP-6194/src/test/core/ (props changed)
hadoop/common/branches/HADOOP-6194/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
Propchange: hadoop/common/branches/HADOOP-6194/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:804966-805825
+/hadoop/common/trunk:804966-806686
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/HADOOP-6194/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/CHANGES.txt?rev=806688&r1=806687&r2=806688&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/CHANGES.txt (original)
+++ hadoop/common/branches/HADOOP-6194/CHANGES.txt Fri Aug 21 19:24:25 2009
@@ -497,6 +497,9 @@
for testing. (Kan Zhang via szetszwo)
HADOOP-6182. Fix ReleaseAudit warnings (Giridharan Kesavan and Lee Tucker
via gkesavan)
+
+ HADOOP-6173. Change src/native/packageNativeHadoop.sh to package all
+ native library files. (Hong Tang via szetszwo)
OPTIMIZATIONS
@@ -925,6 +928,9 @@
HADOOP-6192. Fix Shell.getUlimitMemoryCommand to not rely on Map-Reduce
specific configs. (acmurthy)
+ HADOOP-6103. Clones the classloader as part of Configuration clone.
+ (Amareshwari Sriramadasu via ddas)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/HADOOP-6194/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:804966-805825
+/hadoop/common/trunk/CHANGES.txt:804966-806686
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/HADOOP-6194/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:804966-805825
+/hadoop/common/trunk/src/contrib/ec2:804966-806686
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/HADOOP-6194/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/docs:804966-805825
+/hadoop/common/trunk/src/docs:804966-806686
/hadoop/core/branches/HADOOP-4687/core/src/docs:776175-786719
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/HADOOP-6194/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:804966-805825
+/hadoop/common/trunk/src/java:804966-806686
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/conf/Configuration.java?rev=806688&r1=806687&r2=806688&view=diff
==============================================================================
---
hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/conf/Configuration.java
Fri Aug 21 19:24:25 2009
@@ -243,6 +243,9 @@
synchronized(Configuration.class) {
REGISTRY.put(this, null);
}
+ this.classLoader = other.classLoader;
+ this.loadDefaults = other.loadDefaults;
+ setQuietMode(other.getQuietMode());
}
/**
@@ -1373,6 +1376,10 @@
this.quietmode = quietmode;
}
+ synchronized boolean getQuietMode() {
+ return this.quietmode;
+ }
+
/** For debugging. List non-default properties to the terminal and exit. */
public static void main(String[] args) throws Exception {
new Configuration().writeXml(System.out);
Modified: hadoop/common/branches/HADOOP-6194/src/native/packageNativeHadoop.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/src/native/packageNativeHadoop.sh?rev=806688&r1=806687&r2=806688&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/src/native/packageNativeHadoop.sh
(original)
+++ hadoop/common/branches/HADOOP-6194/src/native/packageNativeHadoop.sh Fri
Aug 21 19:24:25 2009
@@ -42,7 +42,7 @@
fi
echo "Copying libraries in $BASE_NATIVE_LIB_DIR/$platform to
$DIST_LIB_DIR/$platform/"
cd $BASE_NATIVE_LIB_DIR/$platform/
- $TAR *hadoop* | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
+ $TAR . | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
done
fi
@@ -58,7 +58,7 @@
fi
echo "Copying libraries in $BUILD_NATIVE_DIR/$platform/lib to
$DIST_LIB_DIR/$platform/"
cd $BUILD_NATIVE_DIR/$platform/lib
- $TAR *hadoop* | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
+ $TAR . | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
done
fi
Propchange: hadoop/common/branches/HADOOP-6194/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 19:24:25 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:804966-805825
+/hadoop/common/trunk/src/test/core:804966-806686
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HADOOP-6194/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/src/test/core/org/apache/hadoop/conf/TestConfiguration.java?rev=806688&r1=806687&r2=806688&view=diff
==============================================================================
---
hadoop/common/branches/HADOOP-6194/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
(original)
+++
hadoop/common/branches/HADOOP-6194/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
Fri Aug 21 19:24:25 2009
@@ -21,10 +21,6 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.DataInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.Random;
@@ -401,6 +397,17 @@
assertFalse(conf.iterator().hasNext());
}
+ public static class Fake_ClassLoader extends ClassLoader {
+ }
+
+ public void testClassLoader() {
+ Configuration conf = new Configuration(false);
+ conf.setQuietMode(false);
+ conf.setClassLoader(new Fake_ClassLoader());
+ Configuration other = new Configuration(conf);
+ assertTrue(other.getClassLoader() instanceof Fake_ClassLoader);
+ }
+
public static void main(String[] argv) throws Exception {
junit.textui.TestRunner.main(new String[]{
TestConfiguration.class.getName()
