Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9400. TestRollingUpgradeRollback fails on branch-2. Contributed by Brahma Reddy Battula. 

(cherry picked from commit bad2afe39a)
This commit is contained in:
cnauroth 2015-11-18 11:00:18 -08:00
parent 44011a1759
commit 7b94ae17ab
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
View File

@ -621,7 +621,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#getPreferredBlockSize(String) * @see ClientProtocol#getPreferredBlockSize(String)
*/ */
public long getBlockSize(String f) throws IOException { public long getBlockSize(String f) throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("getBlockSize", f)) { try (TraceScope ignored = newPathTraceScope("getBlockSize", f)) {
return namenode.getPreferredBlockSize(f); return namenode.getPreferredBlockSize(f);
} catch (IOException ie) { } catch (IOException ie) {
@ -864,7 +863,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
*/ */
public BlockLocation[] getBlockLocations(String src, long start, public BlockLocation[] getBlockLocations(String src, long start,
long length) throws IOException { long length) throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("getBlockLocations", src)) { try (TraceScope ignored = newPathTraceScope("getBlockLocations", src)) {
LocatedBlocks blocks = getLocatedBlocks(src, start, length); LocatedBlocks blocks = getLocatedBlocks(src, start, length);
BlockLocation[] locations = DFSUtilClient.locatedBlocks2Locations(blocks); BlockLocation[] locations = DFSUtilClient.locatedBlocks2Locations(blocks);
@ -1325,7 +1323,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
*/ */
public void createSymlink(String target, String link, boolean createParent) public void createSymlink(String target, String link, boolean createParent)
throws IOException { throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("createSymlink", target)) { try (TraceScope ignored = newPathTraceScope("createSymlink", target)) {
final FsPermission dirPerm = applyUMask(null); final FsPermission dirPerm = applyUMask(null);
namenode.createSymlink(target, link, dirPerm, createParent); namenode.createSymlink(target, link, dirPerm, createParent);
@ -1446,7 +1443,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
*/ */
public boolean setReplication(String src, short replication) public boolean setReplication(String src, short replication)
throws IOException { throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("setReplication", src)) { try (TraceScope ignored = newPathTraceScope("setReplication", src)) {
return namenode.setReplication(src, replication); return namenode.setReplication(src, replication);
} catch (RemoteException re) { } catch (RemoteException re) {
@ -1467,7 +1463,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
*/ */
public void setStoragePolicy(String src, String policyName) public void setStoragePolicy(String src, String policyName)
throws IOException { throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("setStoragePolicy", src)) { try (TraceScope ignored = newPathTraceScope("setStoragePolicy", src)) {
namenode.setStoragePolicy(src, policyName); namenode.setStoragePolicy(src, policyName);
} catch (RemoteException e) { } catch (RemoteException e) {
@ -1500,7 +1495,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @return All the existing storage policies * @return All the existing storage policies
*/ */
public BlockStoragePolicy[] getStoragePolicies() throws IOException { public BlockStoragePolicy[] getStoragePolicies() throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("getStoragePolicies")) { try (TraceScope ignored = tracer.newScope("getStoragePolicies")) {
return namenode.getStoragePolicies(); return namenode.getStoragePolicies();
} }
@ -2325,7 +2319,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* *
*/ */
void saveNamespace() throws IOException { void saveNamespace() throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("saveNamespace")) { try (TraceScope ignored = tracer.newScope("saveNamespace")) {
namenode.saveNamespace(); namenode.saveNamespace();
} catch (RemoteException re) { } catch (RemoteException re) {
@ -2340,7 +2333,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#rollEdits() * @see ClientProtocol#rollEdits()
*/ */
long rollEdits() throws IOException { long rollEdits() throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("rollEdits")) { try (TraceScope ignored = tracer.newScope("rollEdits")) {
return namenode.rollEdits(); return namenode.rollEdits();
} catch (RemoteException re) { } catch (RemoteException re) {
@ -2359,7 +2351,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#restoreFailedStorage(String arg) * @see ClientProtocol#restoreFailedStorage(String arg)
*/ */
boolean restoreFailedStorage(String arg) throws IOException{ boolean restoreFailedStorage(String arg) throws IOException{
checkOpen();
try (TraceScope ignored = tracer.newScope("restoreFailedStorage")) { try (TraceScope ignored = tracer.newScope("restoreFailedStorage")) {
return namenode.restoreFailedStorage(arg); return namenode.restoreFailedStorage(arg);
} }
@ -2373,7 +2364,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#refreshNodes() * @see ClientProtocol#refreshNodes()
*/ */
public void refreshNodes() throws IOException { public void refreshNodes() throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("refreshNodes")) { try (TraceScope ignored = tracer.newScope("refreshNodes")) {
namenode.refreshNodes(); namenode.refreshNodes();
} }
@ -2385,7 +2375,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#metaSave(String) * @see ClientProtocol#metaSave(String)
*/ */
public void metaSave(String pathname) throws IOException { public void metaSave(String pathname) throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("metaSave")) { try (TraceScope ignored = tracer.newScope("metaSave")) {
namenode.metaSave(pathname); namenode.metaSave(pathname);
} }
@ -2400,7 +2389,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#setBalancerBandwidth(long) * @see ClientProtocol#setBalancerBandwidth(long)
*/ */
public void setBalancerBandwidth(long bandwidth) throws IOException { public void setBalancerBandwidth(long bandwidth) throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("setBalancerBandwidth")) { try (TraceScope ignored = tracer.newScope("setBalancerBandwidth")) {
namenode.setBalancerBandwidth(bandwidth); namenode.setBalancerBandwidth(bandwidth);
} }
@ -2410,7 +2398,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#finalizeUpgrade() * @see ClientProtocol#finalizeUpgrade()
*/ */
public void finalizeUpgrade() throws IOException { public void finalizeUpgrade() throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("finalizeUpgrade")) { try (TraceScope ignored = tracer.newScope("finalizeUpgrade")) {
namenode.finalizeUpgrade(); namenode.finalizeUpgrade();
} }
@ -2418,7 +2405,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
RollingUpgradeInfo rollingUpgrade(RollingUpgradeAction action) RollingUpgradeInfo rollingUpgrade(RollingUpgradeAction action)
throws IOException { throws IOException {
checkOpen();
try (TraceScope ignored = tracer.newScope("rollingUpgrade")) { try (TraceScope ignored = tracer.newScope("rollingUpgrade")) {
return namenode.rollingUpgrade(action); return namenode.rollingUpgrade(action);
} }
@ -2495,7 +2481,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
* @see ClientProtocol#getContentSummary(String) * @see ClientProtocol#getContentSummary(String)
*/ */
ContentSummary getContentSummary(String src) throws IOException { ContentSummary getContentSummary(String src) throws IOException {
checkOpen();
try (TraceScope ignored = newPathTraceScope("getContentSummary", src)) { try (TraceScope ignored = newPathTraceScope("getContentSummary", src)) {
return namenode.getContentSummary(src); return namenode.getContentSummary(src);
} catch (RemoteException re) { } catch (RemoteException re) {

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1465,6 +1465,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9397. Fix typo for readChecksum() LOG.warn in BlockSender.java. HDFS-9397. Fix typo for readChecksum() LOG.warn in BlockSender.java.
(Enrique Flores via Arpit Agarwal) (Enrique Flores via Arpit Agarwal)
HDFS-9400. TestRollingUpgradeRollback fails on branch-2.
(Brahma Reddy Battula via cnauroth)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES