You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2011/12/21 21:16:21 UTC
svn commit: r1221864 [3/3] - in /incubator/chukwa/trunk: ./
src/main/java/org/apache/hadoop/chukwa/
src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/
src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/
src/main/java/org/apache...
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java Wed Dec 21 20:16:17 2011
@@ -23,7 +23,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
/**
* Runs external command-line tools, captures output.
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java Wed Dec 21 20:16:17 2011
@@ -19,7 +19,7 @@
package org.apache.hadoop.chukwa.inputtools.plugin;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
public interface IPlugin {
JSONObject execute();
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java Wed Dec 21 20:16:17 2011
@@ -18,22 +18,17 @@
package org.apache.hadoop.chukwa.inputtools.plugin.metrics;
-import java.io.IOException;
-import java.sql.SQLException;
import java.util.Timer;
import java.util.TimerTask;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.chukwa.inputtools.plugin.ExecPlugin;
import org.apache.hadoop.chukwa.inputtools.plugin.IPlugin;
import org.apache.hadoop.chukwa.util.DaemonWatcher;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
public class Exec extends TimerTask {
private static Log log = LogFactory.getLog(Exec.class);
private String cmde = null;
- private Timer timer = null;
private IPlugin plugin = null;
public Exec(String[] cmds) {
@@ -49,15 +44,15 @@ public class Exec extends TimerTask {
public void run() {
try {
JSONObject result = plugin.execute();
- if (result.getInt("status") < 0) {
+ int status = (Integer) result.get("status");
+ if (status < 0) {
System.out.println("Error");
log.warn("[ChukwaError]:" + Exec.class + ", "
- + result.getString("stderr"));
- System.exit(-1);
+ + result.get("stderr"));
} else {
log.info(result.get("stdout"));
}
- } catch (JSONException e) {
+ } catch (Exception e) {
log.error("Exec output unparsable:" + this.cmde);
}
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java Wed Dec 21 20:16:17 2011
@@ -18,23 +18,13 @@
package org.apache.hadoop.chukwa.inputtools.plugin.metrics;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Timer;
-import java.util.TimerTask;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.chukwa.inputtools.plugin.ExecPlugin;
-import org.apache.hadoop.chukwa.inputtools.plugin.IPlugin;
-import org.apache.hadoop.chukwa.util.PidFile;
-import org.json.JSONException;
-import org.json.JSONObject;
public class ExecHelper extends ExecPlugin {
private static Log log = LogFactory.getLog(ExecHelper.class);
private String cmde = null;
- private static PidFile pFile = null;
- private Timer timer = null;
public ExecHelper(String[] cmds) {
StringBuffer c = new StringBuffer();
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java Wed Dec 21 20:16:17 2011
@@ -22,7 +22,7 @@ package org.apache.hadoop.chukwa.inputto
import org.apache.hadoop.chukwa.inputtools.mdl.DataConfig;
import org.apache.hadoop.chukwa.inputtools.plugin.ExecPlugin;
import org.apache.hadoop.chukwa.inputtools.plugin.IPlugin;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
public class NodeActivityPlugin extends ExecPlugin {
private String cmde = null;
@@ -41,11 +41,11 @@ public class NodeActivityPlugin extends
@Override
public JSONObject postProcess(JSONObject execResult) {
try {
- if (execResult.getInt("status") < 0) {
+ if ( (Integer) execResult.get("status") < 0) {
return execResult;
}
- String res = execResult.getString("stdout");
+ String res = (String) execResult.get("stdout");
String[] tab = res.split("\n");
int totalFreeNode = 0;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java Wed Dec 21 20:16:17 2011
@@ -23,8 +23,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.chukwa.inputtools.mdl.DataConfig;
import org.apache.hadoop.chukwa.inputtools.plugin.ExecPlugin;
import org.apache.hadoop.chukwa.inputtools.plugin.IPlugin;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.simple.JSONObject;
public class PbsNodePlugin extends ExecPlugin {
private static Log log = LogFactory.getLog(PbsNodePlugin.class);
@@ -41,15 +40,15 @@ public class PbsNodePlugin extends ExecP
return cmde;
}
- public static void main(String[] args) throws JSONException {
+ public static void main(String[] args) {
IPlugin plugin = new PbsNodePlugin();
JSONObject result = plugin.execute();
System.out.print("Result: " + result);
- if (result.getInt("status") < 0) {
+ if ((Integer) result.get("status") < 0) {
System.out.println("Error");
log.warn("[ChukwaError]:" + PbsNodePlugin.class + ", "
- + result.getString("stderr"));
+ + result.get("stderr"));
} else {
log.info(result.get("stdout"));
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java Wed Dec 21 20:16:17 2011
@@ -19,7 +19,6 @@
package org.apache.hadoop.chukwa.rest.bean;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -32,7 +31,7 @@ import org.apache.commons.logging.LogFac
@XmlRootElement
@XmlType(propOrder={"type", "id", "label", "children"})
public class CatalogBean {
- private static Log log = LogFactory.getLog(CatalogBean.class);
+ private static final Log log = LogFactory.getLog(CatalogBean.class);
private List<CatalogBean> children = new ArrayList<CatalogBean>();
private String type = "text";
private String label = null;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java Wed Dec 21 20:16:17 2011
@@ -19,11 +19,9 @@
package org.apache.hadoop.chukwa.rest.bean;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.logging.Log;
@@ -31,7 +29,7 @@ import org.apache.commons.logging.LogFac
@XmlType(propOrder={"type", "label", "children"})
public class CategoryBean {
- private static Log log = LogFactory.getLog(CategoryBean.class);
+ private static final Log log = LogFactory.getLog(CategoryBean.class);
private List<CategoryBean> children = new ArrayList<CategoryBean>();
private String type = "text";
private String label = null;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java Wed Dec 21 20:16:17 2011
@@ -21,8 +21,6 @@ package org.apache.hadoop.chukwa.rest.be
import java.text.ParseException;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -53,11 +51,11 @@ public class ColumnBean {
@XmlElement
public WidgetBean[] getWidgets() {
- return widgets;
+ return widgets.clone();
}
public void setWidgets(WidgetBean[] ws) {
- widgets=ws;
+ widgets=(WidgetBean[]) ws.clone();
}
public void update() {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java Wed Dec 21 20:16:17 2011
@@ -21,9 +21,6 @@ package org.apache.hadoop.chukwa.rest.be
import java.text.ParseException;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -78,7 +75,7 @@ public class PagesBean {
@XmlElement(name="layout")
public ColumnBean[] getLayout() {
- return layout;
+ return layout.clone();
}
public void update() {
@@ -92,16 +89,16 @@ public class PagesBean {
}
public void setLayout(ColumnBean[] layout) {
- this.layout = layout;
+ this.layout = (ColumnBean[]) layout.clone();
}
@XmlElement(name="colSize")
public int[] getColSize() {
- return this.columnSizes;
+ return this.columnSizes.clone();
}
public void setColSize(int[] size) {
- this.columnSizes = size;
+ this.columnSizes = (int[]) size.clone();
}
@XmlElement(name="columns")
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java Wed Dec 21 20:16:17 2011
@@ -45,52 +45,47 @@ public class ParametersBean {
}
public ParametersBean(JSONObject json) throws ParseException {
- try {
- name=(String) json.get("name");
- type=(String) json.get("type");
- if(json.containsKey("value")) {
- if(json.get("value").getClass()==JSONArray.class) {
- JSONArray ja = (JSONArray) json.get("value");
- Collection<String> c = new HashSet<String>();
- for(int i = 0; i < ja.size(); i++) {
- c.add((String) ja.get(i));
- }
- this.value = c;
- } else {
- Collection<String> c = new HashSet<String>();
- c.add((String)json.get("value"));
- this.value = c;
- }
- }
- if(json.containsKey("label")) {
- label=(String) json.get("label");
- } else {
- label=(String) json.get("name");
- }
- if(json.get("type").toString().intern()=="custom".intern()) {
- control=(String) json.get("control");
- }
- if(json.containsKey("callback")) {
- callback=(String) json.get("callback");
- }
- if(json.containsKey("options")) {
- JSONArray aj = (JSONArray) json.get("options");
- options = new OptionBean[aj.size()];
- for(int i=0;i<aj.size();i++) {
- OptionBean o = new OptionBean((JSONObject) aj.get(i));
- options[i]=o;
+ name=(String) json.get("name");
+ type=(String) json.get("type");
+ if(json.containsKey("value")) {
+ if(json.get("value").getClass()==JSONArray.class) {
+ JSONArray ja = (JSONArray) json.get("value");
+ Collection<String> c = new HashSet<String>();
+ for(int i = 0; i < ja.size(); i++) {
+ c.add((String) ja.get(i));
}
+ this.value = c;
+ } else {
+ Collection<String> c = new HashSet<String>();
+ c.add((String)json.get("value"));
+ this.value = c;
+ }
+ }
+ if(json.containsKey("label")) {
+ label=(String) json.get("label");
+ } else {
+ label=(String) json.get("name");
+ }
+ if(json.get("type").toString().intern()=="custom".intern()) {
+ control=(String) json.get("control");
+ }
+ if(json.containsKey("callback")) {
+ callback=(String) json.get("callback");
+ }
+ if(json.containsKey("options")) {
+ JSONArray aj = (JSONArray) json.get("options");
+ options = new OptionBean[aj.size()];
+ for(int i=0;i<aj.size();i++) {
+ OptionBean o = new OptionBean((JSONObject) aj.get(i));
+ options[i]=o;
}
- if(json.containsKey("edit")) {
- if(json.get("edit").getClass().equals(String.class)) {
- edit=(new Integer((String)json.get("edit"))).intValue();
- } else if(json.get("edit").getClass().equals(Long.class)) {
- edit=((Long)json.get("edit")).intValue();
- }
+ }
+ if(json.containsKey("edit")) {
+ if(json.get("edit").getClass().equals(String.class)) {
+ edit=(new Integer((String)json.get("edit"))).intValue();
+ } else if(json.get("edit").getClass().equals(Long.class)) {
+ edit=((Long)json.get("edit")).intValue();
}
- } catch (Exception e) {
- log.error(ExceptionUtil.getStackTrace(e));
- throw new ParseException(ExceptionUtil.getStackTrace(e), 0);
}
}
@@ -121,7 +116,10 @@ public class ParametersBean {
@XmlElement
public OptionBean[] getOptions() {
- return options;
+ if(options==null) {
+ options = new OptionBean[1];
+ }
+ return options.clone();
}
@XmlElement
@@ -155,7 +153,7 @@ public class ParametersBean {
}
public void setOptions(OptionBean[] options) {
- this.options = options;
+ this.options = (OptionBean[]) options.clone();
}
public void setEdit(int edit) {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java Wed Dec 21 20:16:17 2011
@@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement
@XmlType(propOrder={"code", "message"})
public class ReturnCodeBean {
- public static int FAIL=0;
- public static int SUCCESS=1;
+ public static final int FAIL=0;
+ public static final int SUCCESS=1;
private int code;
private String message;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java Wed Dec 21 20:16:17 2011
@@ -73,7 +73,7 @@ public class ViewBean {
@XmlElement
public PagesBean[] getPages() {
- return pages;
+ return pages.clone();
}
@XmlElement
@@ -102,7 +102,7 @@ public class ViewBean {
}
public void setPages(PagesBean[] pages) {
- this.pages = pages;
+ this.pages = (PagesBean[]) pages.clone();
}
public void setDescription(String description) {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java Wed Dec 21 20:16:17 2011
@@ -118,7 +118,7 @@ public class WidgetBean {
@XmlElement
public ParametersBean[] getParameters() {
- return parameters;
+ return parameters.clone();
}
public void setId(String id) {
@@ -150,7 +150,7 @@ public class WidgetBean {
}
public void setParameters(ParametersBean[] p) {
- this.parameters=p;
+ this.parameters=p.clone();
}
public void update() {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java Wed Dec 21 20:16:17 2011
@@ -19,24 +19,19 @@ package org.apache.hadoop.chukwa.rest.re
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.chukwa.Chunk;
import org.apache.hadoop.chukwa.dataloader.SocketDataLoader;
import org.apache.hadoop.chukwa.rest.bean.ClientTraceBean;
-import org.apache.hadoop.chukwa.util.RecordConstants;
/**
* Client Trace REST API for parsing client trace log file and convert
@@ -44,7 +39,7 @@ import org.apache.hadoop.chukwa.util.Rec
*/
@Path("clienttrace")
public class ClientTrace {
- protected static Log log = LogFactory.getLog(ClientTrace.class);
+ protected static final Log log = LogFactory.getLog(ClientTrace.class);
private static SocketDataLoader sdl = null;
// Client trace log file pattern
private final Pattern pattern =
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java Wed Dec 21 20:16:17 2011
@@ -37,7 +37,7 @@ import org.apache.hadoop.chukwa.util.Exc
@Path ("/user")
public class UserResource {
- protected static Log log = LogFactory.getLog(UserResource.class);
+ protected static final Log log = LogFactory.getLog(UserResource.class);
@GET
@Path("uid/{uid}")
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java Wed Dec 21 20:16:17 2011
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.chukwa.rest.resource;
-import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.api.json.JSONJAXBContext;
import org.apache.hadoop.chukwa.rest.bean.ViewBean;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java Wed Dec 21 20:16:17 2011
@@ -26,7 +26,6 @@ import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -41,7 +40,7 @@ import org.apache.hadoop.chukwa.util.Exc
@Path ("/view")
public class ViewResource {
- protected static Log log = LogFactory.getLog(ViewResource.class);
+ protected static final Log log = LogFactory.getLog(ViewResource.class);
@GET
@Path("vid/{vid}")
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java Wed Dec 21 20:16:17 2011
@@ -21,7 +21,6 @@ import com.sun.jersey.api.json.JSONJAXBC
import org.apache.hadoop.chukwa.rest.bean.CatalogBean;
import org.apache.hadoop.chukwa.rest.bean.CategoryBean;
-import org.apache.hadoop.chukwa.rest.bean.ViewBean;
import java.util.Arrays;
import java.util.HashMap;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java Wed Dec 21 20:16:17 2011
@@ -75,7 +75,9 @@ public class BackfillingLoader {
adaptor.start("", recordType, 0l,queue);
adaptor.shutdown(AdaptorShutdownPolicy.WAIT_TILL_FINISHED);
connector.shutdown();
- file.renameTo(new File(logFile + ".sav"));
+ if(!file.renameTo(new File(logFile + ".sav"))) {
+ System.err.println("Error in renaming "+logFile+" to "+logFile+".sav");
+ }
}
public static void usage() {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java Wed Dec 21 20:16:17 2011
@@ -32,9 +32,7 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.hadoop.chukwa.extraction.demux.processor.mapper.AbstractProcessor;
import org.apache.log4j.Logger;
-import org.mortbay.log.Log;
public class ClassUtils {
static Logger log = Logger.getLogger(ClassUtils.class);
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java Wed Dec 21 20:16:17 2011
@@ -23,7 +23,7 @@ import java.io.*;
import java.util.*;
public class ClusterConfig {
- public static HashMap<String, String> clusterMap = new HashMap<String, String>();
+ public static final HashMap<String, String> clusterMap = new HashMap<String, String>();
private String path = System.getenv("CHUKWA_CONF_DIR") + File.separator;
static public String getContents(File aFile) {
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java Wed Dec 21 20:16:17 2011
@@ -24,8 +24,6 @@ import java.util.regex.*;
import org.apache.hadoop.chukwa.*;
import org.apache.hadoop.chukwa.datacollection.*;
import org.apache.hadoop.chukwa.datacollection.adaptor.*;
-import org.apache.hadoop.chukwa.datacollection.agent.AdaptorManager;
-import org.apache.hadoop.chukwa.datacollection.agent.AdaptorManager;
import org.apache.hadoop.conf.Configuration;
/**
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java Wed Dec 21 20:16:17 2011
@@ -21,8 +21,6 @@ package org.apache.hadoop.chukwa.util;
import org.apache.hadoop.chukwa.ChukwaArchiveKey;
import org.apache.hadoop.chukwa.ChunkImpl;
-import org.apache.hadoop.chukwa.datacollection.writer.SeqFileWriter;
-import org.apache.hadoop.chukwa.datacollection.writer.localfs.LocalWriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ChecksumException;
import org.apache.hadoop.fs.FSDataOutputStream;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java Wed Dec 21 20:16:17 2011
@@ -18,8 +18,6 @@
package org.apache.hadoop.chukwa.util;
-
-import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Connection;
import java.sql.Statement;
@@ -29,7 +27,6 @@ import java.util.List;
import java.text.SimpleDateFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.chukwa.inputtools.mdl.DataConfig;
public class DatabaseWriter {
private static Log log = LogFactory.getLog(DatabaseWriter.class);
@@ -39,7 +36,6 @@ public class DatabaseWriter {
private ResultSet rs = null;
public DatabaseWriter(String host, String user, String password) {
- DataConfig mdlConfig = new DataConfig();
String jdbc_url = "jdbc:mysql://" + host + "/";
if (user != null) {
jdbc_url = jdbc_url + "?user=" + user;
@@ -100,6 +96,7 @@ public class DatabaseWriter {
stmt.close();
} catch (SQLException sqlEx) {
// ignore
+ log.debug(ExceptionUtil.getStackTrace(sqlEx));
}
stmt = null;
}
@@ -127,7 +124,6 @@ public class DatabaseWriter {
log.debug("SQLState: " + ex.getSQLState());
log.debug("VendorError: " + ex.getErrorCode());
throw ex;
- } finally {
}
return rs;
}
@@ -145,7 +141,6 @@ public class DatabaseWriter {
log.debug("SQLState: " + ex.getSQLState());
log.debug("VendorError: " + ex.getErrorCode());
throw ex;
- } finally {
}
return rs;
}
@@ -160,6 +155,7 @@ public class DatabaseWriter {
rs.close();
} catch (SQLException sqlEx) {
// ignore
+ log.debug(ExceptionUtil.getStackTrace(sqlEx));
}
rs = null;
}
@@ -168,6 +164,7 @@ public class DatabaseWriter {
stmt.close();
} catch (SQLException sqlEx) {
// ignore
+ log.debug(ExceptionUtil.getStackTrace(sqlEx));
}
stmt = null;
}
@@ -176,6 +173,7 @@ public class DatabaseWriter {
conn.close();
} catch (SQLException sqlEx) {
// ignore
+ log.debug(ExceptionUtil.getStackTrace(sqlEx));
}
conn = null;
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java Wed Dec 21 20:16:17 2011
@@ -18,16 +18,13 @@
package org.apache.hadoop.chukwa.util;
-import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.regex.*;
import java.util.*;
import java.io.*;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.chukwa.*;
import org.apache.hadoop.chukwa.conf.ChukwaConfiguration;
-import org.apache.hadoop.chukwa.extraction.engine.RecordUtil;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FileUtil;
@@ -231,7 +228,7 @@ public class DumpChunks {
}
protected void displayResults(PrintStream out) throws IOException{
- ; //did this in updateMatchCatalog
+ //did this in updateMatchCatalog
}
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/Filter.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/Filter.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/Filter.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/Filter.java Wed Dec 21 20:16:17 2011
@@ -19,7 +19,6 @@ package org.apache.hadoop.chukwa.util;
import java.util.ArrayList;
import java.util.List;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.apache.commons.lang.ArrayUtils;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java Wed Dec 21 20:16:17 2011
@@ -34,7 +34,6 @@ public class MaxRateSender extends Threa
private long offset;
private String type;
ChunkReceiver dest;
- private String adaptorID;
public String getCurrentStatus() {
return type;
@@ -43,7 +42,6 @@ public class MaxRateSender extends Threa
public void start(String adaptorID, String type, long offset,
ChunkReceiver dest) throws AdaptorException {
this.setName("MaxRateSender adaptor");
- this.adaptorID = adaptorID;
this.offset = offset;
this.type = type;
this.dest = dest;
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/PidFile.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/PidFile.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/PidFile.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/PidFile.java Wed Dec 21 20:16:17 2011
@@ -43,6 +43,7 @@ public class PidFile extends Thread {
chukwaHome = new File(tmpDir, "chukwa");
chukwaHome.mkdir();
} catch(IOException e) {
+ log.debug(ExceptionUtil.getStackTrace(e));
} finally {
DEFAULT_CHUKWA_HOME = chukwaHome.getAbsolutePath();
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java Wed Dec 21 20:16:17 2011
@@ -53,6 +53,7 @@ public class XssFilter {
}
} catch(NullPointerException ex) {
// Do nothing if session does not exist.
+ log.debug(ExceptionUtil.getStackTrace(ex));
}
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java Wed Dec 21 20:16:17 2011
@@ -22,12 +22,8 @@ package org.apache.hadoop.mapred;
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobHistory;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.JobTracker;
-import org.apache.hadoop.mapred.TaskAttemptID;
import org.apache.hadoop.chukwa.datacollection.controller.ChukwaAgentController;
+import org.apache.hadoop.chukwa.util.ExceptionUtil;
import org.apache.hadoop.fs.Path;
public class ChukwaJobTrackerInstrumentation extends
@@ -53,7 +49,6 @@ public class ChukwaJobTrackerInstrumenta
public void submitJob(JobConf conf, JobID id) {
super.submitJob(conf,id);
- String chukwaJobConf = tracker.getLocalJobFilePath(id);
try {
String jobFileName = JobHistory.JobInfo.getJobHistoryFileName(conf, id);
Path jobHistoryPath = JobHistory.JobInfo
@@ -75,7 +70,7 @@ public class ChukwaJobTrackerInstrumenta
}
jobHistories.put(id, adaptorID);
} catch (Exception ex) {
-
+ log.warn(ExceptionUtil.getStackTrace(ex));
}
}
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java Wed Dec 21 20:16:17 2011
@@ -328,7 +328,6 @@ public abstract class AbstractMetricsCon
* the internal table of metric data.
*/
protected void update(MetricsRecordImpl record) {
- long now = System.currentTimeMillis();
String recordName = record.getRecordName();
TagMap tagTable = record.getTagTable();
Modified: incubator/chukwa/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/site/site.xml?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/site/site.xml (original)
+++ incubator/chukwa/trunk/src/site/site.xml Wed Dec 21 20:16:17 2011
@@ -63,8 +63,8 @@
<menu name="Miscellaneous">
<item name="Release Notes" href="releasenotes.html"/>
<item name="Change Log" href="changes.html"/>
- <item name="Find Bugs Report" href="findbugs.html"/>
- <item name="PMD Report" href="pmd.html"/>
+<!-- <item name="Find Bugs Report" href="findbugs.html"/>
+ <item name="PMD Report" href="pmd.html"/> -->
</menu>
</body>
Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java?rev=1221864&r1=1221863&r2=1221864&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java Wed Dec 21 20:16:17 2011
@@ -38,10 +38,10 @@ public class TestExecAdaptor extends Tes
ChunkCatcherConnector chunks = new ChunkCatcherConnector();
chunks.start();
String psAgentID = agent.processAddCommand(
- "add org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor ps ps aux 0");
- assertNotNull(psAgentID);
+ "add exec= org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor ps 500 ps aux 0");
Chunk c = chunks.waitForAChunk();
System.out.println(new String(c.getData()));
+ assertNotNull(psAgentID);
agent.shutdown();
}