svn merge -c 1594917 merging from trunk to branch-2 to fix:HDFS-6400. Cannot execute hdfs oiv_legacy. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594918 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6d3bfa33c9
commit
d4d3cf1210
|
@ -229,6 +229,8 @@ Release 2.5.0 - UNRELEASED
|
||||||
|
|
||||||
HDFS-6381. Fix a typo in INodeReference.java. (Binglin Chang via jing9)
|
HDFS-6381. Fix a typo in INodeReference.java. (Binglin Chang via jing9)
|
||||||
|
|
||||||
|
HDFS-6400. Cannot execute hdfs oiv_legacy. (Akira AJISAKA via kihwal)
|
||||||
|
|
||||||
Release 2.4.1 - UNRELEASED
|
Release 2.4.1 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -162,7 +162,7 @@ elif [ "$COMMAND" = "jmxget" ] ; then
|
||||||
CLASS=org.apache.hadoop.hdfs.tools.JMXGet
|
CLASS=org.apache.hadoop.hdfs.tools.JMXGet
|
||||||
elif [ "$COMMAND" = "oiv" ] ; then
|
elif [ "$COMMAND" = "oiv" ] ; then
|
||||||
CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewerPB
|
CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewerPB
|
||||||
elif [ "COMMAND" = "oiv_legacy" ] ; then
|
elif [ "$COMMAND" = "oiv_legacy" ] ; then
|
||||||
CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer
|
CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer
|
||||||
elif [ "$COMMAND" = "oev" ] ; then
|
elif [ "$COMMAND" = "oev" ] ; then
|
||||||
CLASS=org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer
|
CLASS=org.apache.hadoop.hdfs.tools.offlineEditsViewer.OfflineEditsViewer
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class OfflineImageViewer {
|
||||||
public static final Log LOG = LogFactory.getLog(OfflineImageViewer.class);
|
public static final Log LOG = LogFactory.getLog(OfflineImageViewer.class);
|
||||||
|
|
||||||
private final static String usage =
|
private final static String usage =
|
||||||
"Usage: bin/hdfs oiv [OPTIONS] -i INPUTFILE -o OUTPUTFILE\n" +
|
"Usage: bin/hdfs oiv_legacy [OPTIONS] -i INPUTFILE -o OUTPUTFILE\n" +
|
||||||
"Offline Image Viewer\n" +
|
"Offline Image Viewer\n" +
|
||||||
"View a Hadoop fsimage INPUTFILE using the specified PROCESSOR,\n" +
|
"View a Hadoop fsimage INPUTFILE using the specified PROCESSOR,\n" +
|
||||||
"saving the results in OUTPUTFILE.\n" +
|
"saving the results in OUTPUTFILE.\n" +
|
||||||
|
|
Loading…
Reference in New Issue