You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2010/12/13 12:31:21 UTC
svn commit: r1045071 - in /incubator/hama/trunk/src/java/org/apache/hama: bsp/BSPJobClient.java util/RunJar.java

Author: edwardyoon
Date: Mon Dec 13 11:31:21 2010
New Revision: 1045071

URL: http://svn.apache.org/viewvc?rev=1045071&view=rev
Log:
Update Job commands

Modified:
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java
    incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java

Modified: incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java?rev=1045071&r1=1045070&r2=1045071&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java Mon Dec 13 11:31:21 2010
@@ -520,17 +520,12 @@ public class BSPJobClient extends Config
    * Display usage of the command-line tool and terminate execution
    */
   private void displayUsage(String cmd) {
-    String prefix = "Usage: JobClient ";
+    String prefix = "Usage: hama job ";
     String taskStates = "running, completed";
     if ("-submit".equals(cmd)) {
       System.err.println(prefix + "[" + cmd + " <job-file>]");
     } else if ("-status".equals(cmd) || "-kill".equals(cmd)) {
       System.err.println(prefix + "[" + cmd + " <job-id>]");
-    } else if ("-events".equals(cmd)) {
-      System.err.println(prefix + "[" + cmd
-          + " <job-id> <from-event-#> <#-of-events>]");
-    } else if ("-history".equals(cmd)) {
-      System.err.println(prefix + "[" + cmd + " <jobOutputDir>]");
     } else if ("-list".equals(cmd)) {
       System.err.println(prefix + "[" + cmd + " [all]]");
     } else if ("-kill-task".equals(cmd) || "-fail-task".equals(cmd)) {
@@ -539,18 +534,16 @@ public class BSPJobClient extends Config
       System.err.println(prefix + "[" + cmd + "]");
     } else if ("-list-attempt-ids".equals(cmd)) {
       System.err.println(prefix + "[" + cmd
-          + " <job-id> <task-type> <task-state>]. "
+          + " <job-id> <task-state>]. "
           + "Valid values for <task-state> are " + taskStates);
     } else {
       System.err.printf(prefix + "<command> <args>\n");
       System.err.printf("\t[-submit <job-file>]\n");
       System.err.printf("\t[-status <job-id>]\n");
       System.err.printf("\t[-kill <job-id>]\n");
-      System.err.printf("\t[-events <job-id> <from-event-#> <#-of-events>]\n");
-      System.err.printf("\t[-history <jobOutputDir>]\n");
       System.err.printf("\t[-list [all]]\n");
       System.err.printf("\t[-list-active-grooms]\n");
-      System.err.println("\t[-list-attempt-ids <job-id> <task-type> "
+      System.err.println("\t[-list-attempt-ids <job-id> "
           + "<task-state>]\n");
       System.err.printf("\t[-kill-task <task-id>]\n");
       System.err.printf("\t[-fail-task <task-id>]\n\n");

Modified: incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java?rev=1045071&r1=1045070&r2=1045071&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java Mon Dec 13 11:31:21 2010
@@ -76,7 +76,7 @@ public class RunJar {
    * it must be provided on the command line.
    */
   public static void main(String[] args) throws Throwable {
-    String usage = "RunJar jarFile [mainClass] args...";
+    String usage = "Usage: hama jar <jar> [mainClass] args...";
 
     if (args.length < 1) {
       System.err.println(usage);