CHUKWA-761. Removed confspell from Chukwa. (Eric Yang)
Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/df343afe Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/df343afe Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/df343afe Branch: refs/heads/master Commit: df343afef8ce1425b4271717115384a33efd4cf3 Parents: e1f0df5 Author: Eric Yang <[email protected]> Authored: Mon Jun 22 10:51:17 2015 -0700 Committer: Eric Yang <[email protected]> Committed: Mon Jun 22 10:51:17 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ lib/agent.dict | 35 ------------------- lib/collector.dict | 28 --------------- lib/confspellcheck-README | 29 --------------- lib/confspellcheck.jar | Bin 34725 -> 0 bytes lib/prefuse.jar | Bin 790495 -> 0 bytes pom.xml | 10 ------ .../datacollection/collector/CollectorStub.java | 5 --- .../apache/hadoop/chukwa/util/ChukwaUtil.java | 7 ---- 9 files changed, 2 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 449dce7..90c77c0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -44,6 +44,8 @@ Trunk (unreleased changes) BUGS + CHUKWA-761. Removed confspell from Chukwa. (Eric Yang) + CHUKWA-758. Updated default dashboard to include system metrics. (Eric Yang) CHUKWA-743. Revised pid locking using standard Hadoop approach. (Eric Yang) http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/lib/agent.dict ---------------------------------------------------------------------- diff --git a/lib/agent.dict b/lib/agent.dict deleted file mode 100644 index 5eebfc4..0000000 --- a/lib/agent.dict +++ /dev/null @@ -1,35 +0,0 @@ -$CHUKWA_CONF_DIR -$CHUKWA_HOME File -$CHUKWA_PID_DIR File -CONF-adaptor.dirscan.intervalMs Integral -CONF-adaptor.memBufWrapper.size Integral -CONF-chukwaAgent.adaptor.context.switch.time Time -CONF-chukwaAgent.adaptor.fileadaptor.timeoutperiod Time -CONF-chukwaAgent.checkpoint.dir File -CONF-chukwaAgent.checkpoint.enabled Boolean -CONF-chukwaAgent.checkpoint.interval Time -CONF-chukwaAgent.checkpoint.name -CONF-chukwaAgent.connector.retryRate Time -CONF-chukwaAgent.control.port Portno -CONF-chukwaAgent.control.remote Boolean -CONF-chukwaAgent.fileTailingAdaptor.maxReadSize Integral -CONF-chukwaAgent.initial_adaptors File -CONF-chukwaAgent.sender.collectorTimeout Integral -CONF-chukwaAgent.sender.fastRetries Integral -CONF-chukwaAgent.sender.retries Integral -CONF-chukwaAgent.sender.retryInterval Integral -CONF-chukwaAgent.tags -CONF-chukwaCollector.asyncAcks.scanperiod Time -CONF-chukwaCollector.http.port Portno -CONF-chukwaCollector.rotateInterval Time -CONF-connector.commitpoll.hostfile -CONF-connector.commitpoll.period Time -CONF-connector.commitpoll.timeout Time -CONF-constAdaptor.minSleep Integral -CONF-constAdaptor.sleepVariance Integral -CONF-httpConnector.asyncAcks Boolean -CONF-httpConnector.maxPostSize Integral -CONF-httpConnector.minPostInterval Time -PROP-CHUKWA_CONF_DIR File -PROP-CHUKWA_HOME -PROP-user.name http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/lib/collector.dict ---------------------------------------------------------------------- diff --git a/lib/collector.dict b/lib/collector.dict deleted file mode 100644 index 3b0d9dd..0000000 --- a/lib/collector.dict +++ /dev/null @@ -1,28 +0,0 @@ -$CHUKWA_CONF_DIR -$CHUKWA_DATA_DIR -$CHUKWA_HOME -$CHUKWA_PID_DIR File -CONF-chukwaCollector.asyncAcks.purgedelay Time -CONF-chukwaCollector.asyncAcks.scanpaths -CONF-chukwaCollector.asyncAcks.scanperiod Time -CONF-chukwaCollector.chunkSuppressBufferSize Integral -CONF-chukwaCollector.http.port Integral -CONF-chukwaCollector.http.threads Integral -CONF-chukwaCollector.localOutputDir File -CONF-chukwaCollector.minPercentFreeDisk Integral -CONF-chukwaCollector.outputDir -CONF-chukwaCollector.pipeline ClassName list -CONF-chukwaCollector.rotateInterval Time -CONF-chukwaCollector.showLogs.enabled Boolean -CONF-chukwaCollector.stats.period Time -CONF-chukwaCollector.tee.keepalive Boolean -CONF-chukwaCollector.tee.port Integral -CONF-chukwaCollector.writeChunkRetries Integral -CONF-chukwaCollector.writerClass ClassName -CONF-chukwaRootDir -CONF-fs.default.name URI -CONF-httpConnector.asyncAcks Boolean -CONF-localToRemoteHdfsMover.exitIfHDFSNotavailable Boolean -CONF-nullWriter.dataRate Time -CONF-writer.hdfs.filesystem URI -PROP-CHUKWA_HOME http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/lib/confspellcheck-README ---------------------------------------------------------------------- diff --git a/lib/confspellcheck-README b/lib/confspellcheck-README deleted file mode 100644 index 8a47126..0000000 --- a/lib/confspellcheck-README +++ /dev/null @@ -1,29 +0,0 @@ -This directory holds a configuration spellcheck tool, being developed by Ari Rabkin at UC Bekeley. (Contact [email protected] for details) - -The checker has two basic tasks. First, to make sure that every option set in a configuration file is an option actually supported by the program in question. Second, to check that the values specified for the option make sense. (In case, e.g., a user confuses a numeric from boolean parameter). - - - -DICTIONARY FORMAT - -Each line of the dictionary files consists of a regular expression, followed by an option type, followed by an optional annotation. These sections are separated by a single tab character. - -Each regular expression may match one or more valid options. (This is to cover cases like Hadoop's fs.x.impl, where x can be any string). - -The list of valid option types is as follows: - Address - Boolean - ClassName - File - Fraction - Integral - NetworkInterface - Portno - Special - URI - URL - -Most of these are self-explanatory. Special means that the option must be one of a small number of string options. The list of valid options goes in the annotation field. It should be comma-separated and wrapped in {}. - -If a dictionary includes a type not on that list, the checker will assume that all values are acceptable for that option. - http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/lib/confspellcheck.jar ---------------------------------------------------------------------- diff --git a/lib/confspellcheck.jar b/lib/confspellcheck.jar deleted file mode 100644 index a9bbc5a..0000000 Binary files a/lib/confspellcheck.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/lib/prefuse.jar ---------------------------------------------------------------------- diff --git a/lib/prefuse.jar b/lib/prefuse.jar deleted file mode 100644 index ce6d719..0000000 Binary files a/lib/prefuse.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49cad82..6ad2055 100644 --- a/pom.xml +++ b/pom.xml @@ -119,13 +119,6 @@ <version>2.0</version> </dependency> <dependency> - <groupId>edu.berkeley.confspell</groupId> - <artifactId>confspellcheck</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${basedir}/lib/confspellcheck.jar</systemPath> - </dependency> - <dependency> <groupId>com.rubiconproject.oss</groupId> <artifactId>jchronic</artifactId> <version>0.2.6</version> @@ -482,7 +475,6 @@ <target>1.6</target> <excludes> <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude> - <exclude>**/JobLog.java</exclude> </excludes> </configuration> </execution> @@ -498,8 +490,6 @@ <target>1.6</target> <testExcludes> <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude> - <exclude>**/JobLog.java</exclude> - <exclude>**/TestJobLogEntry.java</exclude> <exclude>**/TestDemuxManager.java</exclude> <exclude>**/TestFSMBuilder.java</exclude> </testExcludes> http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java index 1312e2f..2a17417 100644 --- a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java +++ b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java @@ -28,9 +28,6 @@ import org.apache.hadoop.chukwa.datacollection.writer.*; import org.apache.hadoop.chukwa.conf.ChukwaConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import edu.berkeley.confspell.Checker; -import edu.berkeley.confspell.HSlurper; -import edu.berkeley.confspell.OptDictionary; import javax.servlet.http.HttpServlet; import java.io.File; import java.util.*; @@ -59,8 +56,6 @@ public class CollectorStub { Configuration collectorConf = new Configuration(false); collectorConf.addResource(new Path(conf.getChukwaConf() + "/chukwa-common.xml")); collectorConf.addResource(new Path(conf.getChukwaConf() + "/chukwa-collector-conf.xml")); - Checker.checkConf(new OptDictionary(new File(new File(conf.getChukwaHome(), "share/chukwa/lib"), "collector.dict")), - HSlurper.fromHConf(collectorConf)); } catch(Exception e) {e.printStackTrace();} int portNum = conf.getInt("chukwaCollector.http.port", 9999); http://git-wip-us.apache.org/repos/asf/chukwa/blob/df343afe/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java b/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java index 7156f9d..4cc4539 100644 --- a/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java +++ b/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java @@ -24,10 +24,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.log4j.Logger; -import edu.berkeley.confspell.Checker; -import edu.berkeley.confspell.HSlurper; -import edu.berkeley.confspell.OptDictionary; - /* * Create a common set of utility classes for code reuse */ @@ -65,9 +61,6 @@ public class ChukwaUtil { try { Configuration chukwaAgentConf = new Configuration(false); chukwaAgentConf.addResource(new Path(agentConf.getAbsolutePath())); - Checker.checkConf(new OptDictionary(new File(new File(chukwaHome, - "share/chukwa/lib"), "agent.dict")), HSlurper - .fromHConf(chukwaAgentConf)); } catch (Exception e) { e.printStackTrace(); }
