Author: jing9
Date: Fri Aug 8 22:21:35 2014
New Revision: 1616897
URL: http://svn.apache.org/r1616897
Log:
Merging r1616428 through r1616893 from trunk.
Added:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/
- copied from r1616893,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/
- copied from r1616893,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/pom.xml
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/PseudoAuthenticationHandler.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/pom.xml?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/pom.xml
(original)
+++ hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/pom.xml
Fri Aug 8 22:21:35 2014
@@ -144,6 +144,15 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>prepare-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>prepare-test-jar</id>
+ <phase>prepare-package</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java
Fri Aug 8 22:21:35 2014
@@ -120,32 +120,6 @@ public class AuthenticatedURL {
return token;
}
- /**
- * Return the hashcode for the token.
- *
- * @return the hashcode for the token.
- */
- @Override
- public int hashCode() {
- return (token != null) ? token.hashCode() : 0;
- }
-
- /**
- * Return if two token instances are equal.
- *
- * @param o the other token instance.
- *
- * @return if this instance and the other instance are equal.
- */
- @Override
- public boolean equals(Object o) {
- boolean eq = false;
- if (o instanceof Token) {
- Token other = (Token) o;
- eq = (token == null && other.token == null) || (token != null &&
this.token.equals(other.token));
- }
- return eq;
- }
}
private static Class<? extends Authenticator> DEFAULT_AUTHENTICATOR =
KerberosAuthenticator.class;
@@ -209,6 +183,16 @@ public class AuthenticatedURL {
}
/**
+ * Returns the {@link Authenticator} instance used by the
+ * <code>AuthenticatedURL</code>.
+ *
+ * @return the {@link Authenticator} instance
+ */
+ protected Authenticator getAuthenticator() {
+ return authenticator;
+ }
+
+ /**
* Returns an authenticated {@link HttpURLConnection}.
*
* @param url the URL to connect to. Only HTTP/S URLs are supported.
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
Fri Aug 8 22:21:35 2014
@@ -142,12 +142,31 @@ public class KerberosAuthenticationHandl
*/
public static final String NAME_RULES = TYPE + ".name.rules";
+ private String type;
private String keytab;
private GSSManager gssManager;
private Subject serverSubject = new Subject();
private List<LoginContext> loginContexts = new ArrayList<LoginContext>();
/**
+ * Creates a Kerberos SPNEGO authentication handler with the default
+ * auth-token type, <code>kerberos</code>.
+ */
+ public KerberosAuthenticationHandler() {
+ this(TYPE);
+ }
+
+ /**
+ * Creates a Kerberos SPNEGO authentication handler with a custom auth-token
+ * type.
+ *
+ * @param type auth-token type.
+ */
+ public KerberosAuthenticationHandler(String type) {
+ this.type = type;
+ }
+
+ /**
* Initializes the authentication handler instance.
* <p/>
* It creates a Kerberos context using the principal and keytab specified in
the configuration.
@@ -249,7 +268,7 @@ public class KerberosAuthenticationHandl
*/
@Override
public String getType() {
- return TYPE;
+ return type;
}
/**
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/PseudoAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/PseudoAuthenticationHandler.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/PseudoAuthenticationHandler.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/PseudoAuthenticationHandler.java
Fri Aug 8 22:21:35 2014
@@ -55,6 +55,25 @@ public class PseudoAuthenticationHandler
private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
private boolean acceptAnonymous;
+ private String type;
+
+ /**
+ * Creates a Hadoop pseudo authentication handler with the default auth-token
+ * type, <code>simple</code>.
+ */
+ public PseudoAuthenticationHandler() {
+ this(TYPE);
+ }
+
+ /**
+ * Creates a Hadoop pseudo authentication handler with a custom auth-token
+ * type.
+ *
+ * @param type auth-token type.
+ */
+ public PseudoAuthenticationHandler(String type) {
+ this.type = type;
+ }
/**
* Initializes the authentication handler instance.
@@ -96,7 +115,7 @@ public class PseudoAuthenticationHandler
*/
@Override
public String getType() {
- return TYPE;
+ return type;
}
/**
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java
Fri Aug 8 22:21:35 2014
@@ -33,36 +33,6 @@ public class TestAuthenticatedURL {
token = new AuthenticatedURL.Token("foo");
Assert.assertTrue(token.isSet());
Assert.assertEquals("foo", token.toString());
-
- AuthenticatedURL.Token token1 = new AuthenticatedURL.Token();
- AuthenticatedURL.Token token2 = new AuthenticatedURL.Token();
- Assert.assertEquals(token1.hashCode(), token2.hashCode());
- Assert.assertTrue(token1.equals(token2));
-
- token1 = new AuthenticatedURL.Token();
- token2 = new AuthenticatedURL.Token("foo");
- Assert.assertNotSame(token1.hashCode(), token2.hashCode());
- Assert.assertFalse(token1.equals(token2));
-
- token1 = new AuthenticatedURL.Token("foo");
- token2 = new AuthenticatedURL.Token();
- Assert.assertNotSame(token1.hashCode(), token2.hashCode());
- Assert.assertFalse(token1.equals(token2));
-
- token1 = new AuthenticatedURL.Token("foo");
- token2 = new AuthenticatedURL.Token("foo");
- Assert.assertEquals(token1.hashCode(), token2.hashCode());
- Assert.assertTrue(token1.equals(token2));
-
- token1 = new AuthenticatedURL.Token("bar");
- token2 = new AuthenticatedURL.Token("foo");
- Assert.assertNotSame(token1.hashCode(), token2.hashCode());
- Assert.assertFalse(token1.equals(token2));
-
- token1 = new AuthenticatedURL.Token("foo");
- token2 = new AuthenticatedURL.Token("bar");
- Assert.assertNotSame(token1.hashCode(), token2.hashCode());
- Assert.assertFalse(token1.equals(token2));
}
@Test
@@ -137,4 +107,12 @@ public class TestAuthenticatedURL {
Mockito.verify(connConf).configure(Mockito.<HttpURLConnection>any());
}
+ @Test
+ public void testGetAuthenticator() throws Exception {
+ Authenticator authenticator = Mockito.mock(Authenticator.class);
+
+ AuthenticatedURL aURL = new AuthenticatedURL(authenticator);
+ Assert.assertEquals(authenticator, aURL.getAuthenticator());
+ }
+
}
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Aug 8 22:21:35 2014
@@ -490,6 +490,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-10791. AuthenticationFilter should support externalizing the
secret for signing and provide rotation support. (rkanter via tucu)
+ HADOOP-10771. Refactor HTTP delegation support out of httpfs to common,
PART 1. (tucu)
+
OPTIMIZATIONS
BUG FIXES
@@ -521,9 +523,6 @@ Release 2.6.0 - UNRELEASED
HADOOP-10830. Missing lock in JavaKeyStoreProvider.createCredentialEntry.
(Benoy Antony via umamahesh)
- HADOOP-10876. The constructor of Path should not take an empty URL as a
- parameter. (Zhihai Xu via wang)
-
HADOOP-10928. Incorrect usage on `hadoop credential list`.
(Josh Elser via wang)
@@ -543,6 +542,11 @@ Release 2.6.0 - UNRELEASED
HADOOP-10905. LdapGroupsMapping Should use configuration.getPassword for
SSL
and LDAP Passwords. (lmccay via brandonli)
+ HADOOP-10931 compile error on tools/hadoop-openstack (xukun via stevel)
+
+ HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders
+ (lmccay via brandonli)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1616481
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1616428-1616893
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/pom.xml?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/pom.xml
Fri Aug 8 22:21:35 2014
@@ -204,6 +204,17 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minikdc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</dependency>
Propchange:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1616428-1616893
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Fri Aug 8 22:21:35 2014
@@ -1781,7 +1781,7 @@ public class Configuration implements It
public char[] getPassword(String name) throws IOException {
char[] pass = null;
- pass = getPasswordFromCredenitalProviders(name);
+ pass = getPasswordFromCredentialProviders(name);
if (pass == null) {
pass = getPasswordFromConfig(name);
@@ -1797,7 +1797,7 @@ public class Configuration implements It
* @return password or null if not found
* @throws IOException
*/
- protected char[] getPasswordFromCredenitalProviders(String name)
+ protected char[] getPasswordFromCredentialProviders(String name)
throws IOException {
char[] pass = null;
try {
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
Fri Aug 8 22:21:35 2014
@@ -128,20 +128,7 @@ public class Path implements Comparable
"Can not create a Path from an empty string");
}
}
-
- /** check URI parameter of Path constructor. */
- private void checkPathArg(URI aUri) throws IllegalArgumentException {
- // disallow construction of a Path from an empty URI
- if (aUri == null) {
- throw new IllegalArgumentException(
- "Can not create a Path from a null URI");
- }
- if (aUri.toString().isEmpty()) {
- throw new IllegalArgumentException(
- "Can not create a Path from an empty URI");
- }
- }
-
+
/** Construct a path from a String. Path strings are URIs, but with
* unescaped elements and some additional normalization. */
public Path(String pathString) throws IllegalArgumentException {
@@ -189,7 +176,6 @@ public class Path implements Comparable
* Construct a path from a URI
*/
public Path(URI aUri) {
- checkPathArg(aUri);
uri = aUri.normalize();
}
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
Fri Aug 8 22:21:35 2014
@@ -21,14 +21,18 @@ package org.apache.hadoop.metrics2.impl;
import java.util.Iterator;
import java.util.List;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
+import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsFilter;
import static org.apache.hadoop.metrics2.lib.Interns.*;
-class MetricsCollectorImpl implements MetricsCollector,
[email protected]
+@VisibleForTesting
+public class MetricsCollectorImpl implements MetricsCollector,
Iterable<MetricsRecordBuilderImpl> {
private final List<MetricsRecordBuilderImpl> rbs = Lists.newArrayList();
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
Fri Aug 8 22:21:35 2014
@@ -90,6 +90,14 @@ public class MutableStat extends Mutable
}
/**
+ * Set whether to display the extended stats (stdev, min/max etc.) or not
+ * @param extended enable/disable displaying extended stats
+ */
+ public synchronized void setExtended(boolean extended) {
+ this.extended = extended;
+ }
+
+ /**
* Add a number of samples and their sum to the running stat
* @param numSamples number of samples
* @param sum of the samples
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
Fri Aug 8 22:21:35 2014
@@ -114,57 +114,18 @@ User Commands
* <<<fs>>>
- Usage: <<<hadoop fs [GENERIC_OPTIONS] [COMMAND_OPTIONS]>>>
-
- Deprecated, use <<<hdfs dfs>>> instead.
-
- Runs a generic filesystem user client.
-
- The various COMMAND_OPTIONS can be found at File System Shell Guide.
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#dfs}<<<hdfs dfs>>>}}
+ instead.
* <<<fsck>>>
- Runs a HDFS filesystem checking utility.
- See {{{../hadoop-hdfs/HdfsUserGuide.html#fsck}fsck}} for more info.
-
- Usage: <<<hadoop fsck [GENERIC_OPTIONS] <path> [-move | -delete |
-openforwrite] [-files [-blocks [-locations | -racks]]] [-showprogress]>>>
-
-*------------------+---------------------------------------------+
-|| COMMAND_OPTION || Description
-*------------------+---------------------------------------------+
-| <path> | Start checking from this path.
-*------------------+---------------------------------------------+
-| -move | Move corrupted files to /lost+found
-*------------------+---------------------------------------------+
-| -delete | Delete corrupted files.
-*------------------+---------------------------------------------+
-| -openforwrite | Print out files opened for write.
-*------------------+---------------------------------------------+
-| -files | Print out files being checked.
-*------------------+---------------------------------------------+
-| -blocks | Print out block report.
-*------------------+---------------------------------------------+
-| -locations | Print out locations for every block.
-*------------------+---------------------------------------------+
-| -racks | Print out network topology for data-node locations.
-*------------------+---------------------------------------------+
-| -showprogress | Print out show progress in output. Default is OFF (no
progress).
-*------------------+---------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#fsck}<<<hdfs fsck>>>}}
+ instead.
* <<<fetchdt>>>
- Gets Delegation Token from a NameNode.
- See {{{../hadoop-hdfs/HdfsUserGuide.html#fetchdt}fetchdt}} for more info.
-
- Usage: <<<hadoop fetchdt [GENERIC_OPTIONS] [--webservice
<namenode_http_addr>] <path> >>>
-
-*------------------------------+---------------------------------------------+
-|| COMMAND_OPTION || Description
-*------------------------------+---------------------------------------------+
-| <fileName> | File name to store the token into.
-*------------------------------+---------------------------------------------+
-| --webservice <https_address> | use http protocol instead of RPC
-*------------------------------+---------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#fetchdt}
+ <<<hdfs fetchdt>>>}} instead.
* <<<jar>>>
@@ -321,23 +282,8 @@ Administration Commands
* <<<balancer>>>
- Runs a cluster balancing utility. An administrator can simply press Ctrl-C
- to stop the rebalancing process. See
- {{{../hadoop-hdfs/HdfsUserGuide.html#Balancer}Balancer}} for more details.
-
- Usage: <<<hadoop balancer [-threshold <threshold>] [-policy <policy>]>>>
-
-*------------------------+-----------------------------------------------------------+
-|| COMMAND_OPTION | Description
-*------------------------+-----------------------------------------------------------+
-| -threshold <threshold> | Percentage of disk capacity. This overwrites the
- | default threshold.
-*------------------------+-----------------------------------------------------------+
-| -policy <policy> | <<<datanode>>> (default): Cluster is balanced if
each datanode is balanced. \
- | <<<blockpool>>>: Cluster is balanced if each block
pool in each datanode is balanced.
-*------------------------+-----------------------------------------------------------+
-
- Note that the <<<blockpool>>> policy is more strict than the <<<datanode>>>
policy.
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#balancer}
+ <<<hdfs balancer>>>}} instead.
* <<<daemonlog>>>
@@ -360,84 +306,13 @@ Administration Commands
* <<<datanode>>>
- Runs a HDFS datanode.
-
- Usage: <<<hadoop datanode [-rollback]>>>
-
-*-----------------+-----------------------------------------------------------+
-|| COMMAND_OPTION || Description
-*-----------------+-----------------------------------------------------------+
-| -rollback | Rollsback the datanode to the previous version. This should
- | be used after stopping the datanode and distributing the
old
- | hadoop version.
-*-----------------+-----------------------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#datanode}
+ <<<hdfs datanode>>>}} instead.
* <<<dfsadmin>>>
- Runs a HDFS dfsadmin client.
-
- Usage: <<<hadoop dfsadmin [GENERIC_OPTIONS] [-report] [-safemode enter |
leave | get | wait] [-refreshNodes] [-finalizeUpgrade] [-upgradeProgress status
| details | force] [-metasave filename] [-setQuota <quota>
<dirname>...<dirname>] [-clrQuota <dirname>...<dirname>] [-restoreFailedStorage
true|false|check] [-help [cmd]]>>>
-
-*-----------------+-----------------------------------------------------------+
-|| COMMAND_OPTION || Description
-*-----------------+-----------------------------------------------------------+
-| -report | Reports basic filesystem information and statistics.
-*-----------------+-----------------------------------------------------------+
-| -safemode enter / leave / get / wait | Safe mode maintenance command. Safe
- | mode is a Namenode state in which it \
- | 1. does not accept changes to the name space (read-only) \
- | 2. does not replicate or delete blocks. \
- | Safe mode is entered automatically at Namenode startup, and
- | leaves safe mode automatically when the configured minimum
- | percentage of blocks satisfies the minimum replication
- | condition. Safe mode can also be entered manually, but then
- | it can only be turned off manually as well.
-*-----------------+-----------------------------------------------------------+
-| -refreshNodes | Re-read the hosts and exclude files to update the set of
- | Datanodes that are allowed to connect to the Namenode and
- | those that should be decommissioned or recommissioned.
-*-----------------+-----------------------------------------------------------+
-| -finalizeUpgrade| Finalize upgrade of HDFS. Datanodes delete their previous
- | version working directories, followed by Namenode doing the
- | same. This completes the upgrade process.
-*-----------------+-----------------------------------------------------------+
-| -upgradeProgress status / details / force | Request current distributed
- | upgrade status, a detailed status or force the upgrade to
- | proceed.
-*-----------------+-----------------------------------------------------------+
-| -metasave filename | Save Namenode's primary data structures to <filename> in
- | the directory specified by hadoop.log.dir property.
- | <filename> is overwritten if it exists.
- | <filename> will contain one line for each of the following\
- | 1. Datanodes heart beating with Namenode\
- | 2. Blocks waiting to be replicated\
- | 3. Blocks currrently being replicated\
- | 4. Blocks waiting to be deleted\
-*-----------------+-----------------------------------------------------------+
-| -setQuota <quota> <dirname>...<dirname> | Set the quota <quota> for each
- | directory <dirname>. The directory quota is a long integer
- | that puts a hard limit on the number of names in the
- | directory tree. Best effort for the directory, with faults
- | reported if \
- | 1. N is not a positive integer, or \
- | 2. user is not an administrator, or \
- | 3. the directory does not exist or is a file, or \
- | 4. the directory would immediately exceed the new quota. \
-*-----------------+-----------------------------------------------------------+
-| -clrQuota <dirname>...<dirname> | Clear the quota for each directory
- | <dirname>. Best effort for the directory. with fault
- | reported if \
- | 1. the directory does not exist or is a file, or \
- | 2. user is not an administrator. It does not fault if the
- | directory has no quota.
-*-----------------+-----------------------------------------------------------+
-| -restoreFailedStorage true / false / check | This option will turn on/off
automatic attempt to restore failed storage replicas.
- | If a failed storage becomes available again the system
will attempt to restore
- | edits and/or fsimage during checkpoint. 'check' option
will return current setting.
-*-----------------+-----------------------------------------------------------+
-| -help [cmd] | Displays help for the given command or all commands if none
- | is specified.
-*-----------------+-----------------------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#dfsadmin}
+ <<<hdfs dfsadmin>>>}} instead.
* <<<mradmin>>>
@@ -470,51 +345,13 @@ Administration Commands
* <<<namenode>>>
- Runs the namenode. More info about the upgrade, rollback and finalize is
- at {{{../hadoop-hdfs/HdfsUserGuide.html#Upgrade_and_Rollback}Upgrade
Rollback}}.
-
- Usage: <<<hadoop namenode [-format] | [-upgrade] | [-rollback] |
[-finalize] | [-importCheckpoint]>>>
-
-*--------------------+-----------------------------------------------------------+
-|| COMMAND_OPTION || Description
-*--------------------+-----------------------------------------------------------+
-| -format | Formats the namenode. It starts the namenode, formats
- | it and then shut it down.
-*--------------------+-----------------------------------------------------------+
-| -upgrade | Namenode should be started with upgrade option after
- | the distribution of new hadoop version.
-*--------------------+-----------------------------------------------------------+
-| -rollback | Rollsback the namenode to the previous version. This
- | should be used after stopping the cluster and
- | distributing the old hadoop version.
-*--------------------+-----------------------------------------------------------+
-| -finalize | Finalize will remove the previous state of the files
- | system. Recent upgrade will become permanent. Rollback
- | option will not be available anymore. After finalization
- | it shuts the namenode down.
-*--------------------+-----------------------------------------------------------+
-| -importCheckpoint | Loads image from a checkpoint directory and save it
- | into the current one. Checkpoint dir is read from
- | property fs.checkpoint.dir
-*--------------------+-----------------------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#namenode}
+ <<<hdfs namenode>>>}} instead.
* <<<secondarynamenode>>>
- Runs the HDFS secondary namenode.
- See {{{../hadoop-hdfs/HdfsUserGuide.html#Secondary_NameNode}Secondary
Namenode}}
- for more info.
-
- Usage: <<<hadoop secondarynamenode [-checkpoint [force]] | [-geteditsize]>>>
-
-*----------------------+-----------------------------------------------------------+
-|| COMMAND_OPTION || Description
-*----------------------+-----------------------------------------------------------+
-| -checkpoint [-force] | Checkpoints the Secondary namenode if EditLog size
- | >= fs.checkpoint.size. If <<<-force>>> is used,
- | checkpoint irrespective of EditLog size.
-*----------------------+-----------------------------------------------------------+
-| -geteditsize | Prints the EditLog size.
-*----------------------+-----------------------------------------------------------+
+ Deprecated, use {{{../hadoop-hdfs/HDFSCommands.html#secondarynamenode}
+ <<<hdfs secondarynamenode>>>}} instead.
* <<<tasktracker>>>
Modified:
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
(original)
+++
hadoop/common/branches/HDFS-6584/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
Fri Aug 8 22:21:35 2014
@@ -26,13 +26,11 @@ import java.util.Arrays;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.AvroTestUtil;
-import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Shell;
import com.google.common.base.Joiner;
import junit.framework.TestCase;
-import static org.junit.Assert.fail;
public class TestPath extends TestCase {
/**
@@ -307,28 +305,6 @@ public class TestPath extends TestCase {
// if the child uri is absolute path
assertEquals("foo://bar/fud#boo", new Path(new Path(new URI(
"foo://bar/baz#bud")), new Path(new URI("/fud#boo"))).toString());
-
- // empty URI
- URI uri3 = new URI("");
- assertEquals("", uri3.toString());
- try {
- path = new Path(uri3);
- fail("Expected exception for empty URI");
- } catch (IllegalArgumentException e) {
- // expect to receive an IllegalArgumentException
- GenericTestUtils.assertExceptionContains("Can not create a Path"
- + " from an empty URI", e);
- }
- // null URI
- uri3 = null;
- try {
- path = new Path(uri3);
- fail("Expected exception for null URI");
- } catch (IllegalArgumentException e) {
- // expect to receive an IllegalArgumentException
- GenericTestUtils.assertExceptionContains("Can not create a Path"
- + " from a null URI", e);
- }
}
/** Test URIs created from Path objects */
