Skip to content

Commit 7dfe1c0

Browse files
ashishdoneriyaashishdoneriya
committed
Refectored code
1. Removed support for Non-Yarn Hadoop. 2. Changed the module profiling to cluster-monitoring and cluster-profiling to cluster-analysis. 3. Removed unused classes, methods and variables
1 parent b8add34 commit 7dfe1c0

File tree

386 files changed

+3668
-31431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

386 files changed

+3668
-31431
lines changed

‎.gitignore

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.project
22
.settings/
3-
cluster-profiling/.classpath
4-
cluster-profiling/.project
5-
cluster-profiling/.settings/
6-
cluster-profiling/target/
3+
cluster-monitoring/.classpath
4+
cluster-monitoring/.project
5+
cluster-monitoring/.settings/
6+
cluster-monitoring/target/
77
common/.classpath
88
common/.project
99
common/.settings/
@@ -38,10 +38,10 @@ execution/.classpath
3838
execution/.project
3939
execution/.settings/
4040
execution/target/
41-
profiling/.classpath
42-
profiling/.project
43-
profiling/.settings/
44-
profiling/target/
41+
cluster-analysis/.classpath
42+
cluster-analysis/.project
43+
cluster-analysis/.settings/
44+
cluster-analysis/target/
4545
remoting-common/.classpath
4646
remoting-common/.project
4747
remoting-common/.settings/

‎NOTICE.txt

+3-10
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ Product includes Other 3rd party software as indicated below
168168
Linking : Dynamic
169169
Modified By Impetus : No
170170

171-
20. Name : Apache Rumen
172-
Source : http://hadoop.apache.org/docs/r1.2.1/rumen.html
171+
20. Name : Dalvik
172+
Source : http://code.google.com/p/dalvik/
173173
License : Apache License Version 2.0
174174
License Source : http://www.apache.org/licenses/LICENSE-2.0
175-
Linking : Static
175+
Linking : Static
176176
Modified By Impetus : Yes
177177

178178
21. Name : Junit
@@ -202,10 +202,3 @@ Product includes Other 3rd party software as indicated below
202202
License Source : http://opensource.org/licenses/BSD-3-Clause
203203
Linking : Static
204204
Modified By Impetus : No
205-
206-
25. Name : Dalvik
207-
Source : http://code.google.com/p/dalvik/
208-
License : Apache License Version 2.0
209-
License Source : http://www.apache.org/licenses/LICENSE-2.0
210-
Linking : Static
211-
Modified By Impetus : Yes

‎assembly.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<include>${project.groupId}:jumbune-exec</include>
5959
<include>${project.groupId}:jumbune-datavalidation</include>
6060
<include>${project.groupId}:jumbune-debugger</include>
61-
<include>${project.groupId}:jumbune-cluster-profiling</include>
61+
<include>${project.groupId}:jumbune-cluster-analysis</include>
6262
</includes>
6363

6464
</dependencySet>
@@ -85,9 +85,8 @@
8585
<include>${project.groupId}:jumbune-common</include>
8686
<include>${project.groupId}:jumbune-utils</include>
8787
<include>${project.groupId}:jumbune-remoting:jar:${project.version}::</include>
88-
<include>${project.groupId}:remoting-common:jar:${project.version}::</include>
89-
<include>${project.groupId}:remoting-jsch:jar:${project.version}::</include>
90-
<include>${project.groupId}:jumbune-rumen</include>
88+
<include>${project.groupId}:jumbune-remoting-common:jar:${project.version}::</include>
89+
<include>${project.groupId}:jumbune-remoting-jsch:jar:${project.version}::</include>
9190
<include>io.netty:netty-handler:jar:4.0.20.Final</include>
9291
<include>io.netty:netty-buffer:jar:4.0.20.Final</include>
9392
<include>io.netty:netty-common:jar:4.0.20.Final</include>

‎bin/jetty-config.xml

+85-99
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,89 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
3-
43
<Configure id="Server" class="org.eclipse.jetty.server.Server">
5-
<!-- Force all communication over secure channels. -->
6-
<Set name="handler">
7-
<New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
8-
<Set name="handlers">
9-
<Array type="org.eclipse.jetty.server.Handler">
10-
<!--Uncomment below block for running Jumbune on https transport-->
11-
<!--Item>
12-
<New id="SecuredRedirectHandler" class="org.eclipse.jetty.server.handler.SecuredRedirectHandler" />
13-
</Item-->
14-
<Item>
15-
<New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
16-
</Item>
17-
<Item>
18-
<New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler" />
19-
</Item>
20-
</Array>
21-
</Set>
22-
</New>
23-
</Set>
24-
25-
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
26-
<Set name="secureScheme">https</Set>
27-
<Set name="securePort">8443</Set>
28-
</New>
29-
30-
<New id="httpsConfig" class="org.eclipse.jetty.server.HttpConfiguration">
31-
<Call name="addCustomizer">
32-
<Arg>
33-
<New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
34-
</Arg>
35-
</Call>
36-
</New>
37-
38-
<New id="connector" class="org.eclipse.jetty.server.ServerConnector">
39-
<Arg name="server">
40-
<Ref refid="Server" />
41-
</Arg>
42-
<Arg name="factories">
43-
<Array type="org.eclipse.jetty.server.ConnectionFactory">
44-
<Item>
45-
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
46-
<Arg name="config">
47-
<Ref refid="httpConfig" />
48-
</Arg>
49-
</New>
50-
</Item>
51-
</Array>
52-
</Arg>
53-
54-
<Set name="port">9080</Set>
55-
</New>
56-
<!--Uncomment below block for running Jumbune on https transport. Generate keystore file, update the file and password below-->
57-
<!--New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
58-
<Set name="KeyStorePath">/home/impadmin/JumbuneHome/bin/keystore</Set>
59-
<Set name="KeyStorePassword">password</Set>
60-
</New-->
61-
62-
<New id="sslConnectionFactory" class="org.eclipse.jetty.server.SslConnectionFactory">
63-
<Arg name="sslContextFactory">
64-
<Ref refid="sslContextFactory" />
65-
</Arg>
66-
<Arg name="next">http/1.1</Arg>
67-
</New>
68-
69-
<New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
70-
<Arg name="server">
71-
<Ref refid="Server" />
72-
</Arg>
73-
<Arg name="factories">
74-
<Array type="org.eclipse.jetty.server.ConnectionFactory">
75-
<Item>
76-
<Ref refid="sslConnectionFactory" />
77-
</Item>
78-
<Item>
79-
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
80-
<Arg name="config">
81-
<Ref refid="httpsConfig" />
82-
</Arg>
83-
</New>
84-
</Item>
85-
</Array>
86-
</Arg>
87-
88-
<Set name="port">8443</Set>
89-
</New>
90-
91-
<Call name="setConnectors">
92-
<Arg>
93-
<Array type="org.eclipse.jetty.server.ServerConnector">
94-
<Item>
95-
<Ref refid="connector" />
96-
</Item>
97-
<Item>
98-
<Ref refid="sslConnector" />
99-
</Item>
100-
</Array>
101-
</Arg>
102-
</Call>
4+
<!-- Force all communication over secure channels. -->
5+
<Set name="handler">
6+
<New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
7+
<Set name="handlers">
8+
<Array type="org.eclipse.jetty.server.Handler">
9+
<!--Uncomment below block for running Jumbune on https transport-->
10+
<!--Item><New id="SecuredRedirectHandler" class="org.eclipse.jetty.server.handler.SecuredRedirectHandler" /></Item-->
11+
<Item>
12+
<New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
13+
</Item>
14+
<Item>
15+
<New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler" />
16+
</Item>
17+
</Array>
18+
</Set>
19+
</New>
20+
</Set>
21+
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
22+
<Set name="secureScheme">https</Set>
23+
<Set name="securePort">8443</Set>
24+
</New>
25+
<New id="httpsConfig" class="org.eclipse.jetty.server.HttpConfiguration">
26+
<Call name="addCustomizer">
27+
<Arg>
28+
<New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
29+
</Arg>
30+
</Call>
31+
</New>
32+
<New id="connector" class="org.eclipse.jetty.server.ServerConnector">
33+
<Arg name="server">
34+
<Ref refid="Server" />
35+
</Arg>
36+
<Arg name="factories">
37+
<Array type="org.eclipse.jetty.server.ConnectionFactory">
38+
<Item>
39+
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
40+
<Arg name="config">
41+
<Ref refid="httpConfig" />
42+
</Arg>
43+
</New>
44+
</Item>
45+
</Array>
46+
</Arg>
47+
<Set name="port">9080</Set>
48+
</New>
49+
<!--Uncomment below block for running Jumbune on https transport. Generate keystore file, update the file and password below-->
50+
<!--New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"><Set name="KeyStorePath">/home/impadmin/JumbuneHome/bin/keystore</Set><Set name="KeyStorePassword">password</Set></New-->
51+
<New id="sslConnectionFactory" class="org.eclipse.jetty.server.SslConnectionFactory">
52+
<Arg name="sslContextFactory">
53+
<Ref refid="sslContextFactory" />
54+
</Arg>
55+
<Arg name="next">http/1.1</Arg>
56+
</New>
57+
<New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
58+
<Arg name="server">
59+
<Ref refid="Server" />
60+
</Arg>
61+
<Arg name="factories">
62+
<Array type="org.eclipse.jetty.server.ConnectionFactory">
63+
<Item>
64+
<Ref refid="sslConnectionFactory" />
65+
</Item>
66+
<Item>
67+
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
68+
<Arg name="config">
69+
<Ref refid="httpsConfig" />
70+
</Arg>
71+
</New>
72+
</Item>
73+
</Array>
74+
</Arg>
75+
<Set name="port">8443</Set>
76+
</New>
77+
<Call name="setConnectors">
78+
<Arg>
79+
<Array type="org.eclipse.jetty.server.ServerConnector">
80+
<Item>
81+
<Ref refid="connector" />
82+
</Item>
83+
<Item>
84+
<Ref refid="sslConnector" />
85+
</Item>
86+
</Array>
87+
</Arg>
88+
</Call>
10389
</Configure>

‎bin/startWeb

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ warpath="${JUMBUNE_HOME}/modules/jumbune*.war"
1616

1717
jetty="${JUMBUNE_HOME}/lib/jetty-runner*.jar"
1818

19-
PORT=8080
20-
if [ "$#" -ne 0 ] ; then
21-
PORT=$1
22-
fi
23-
2419
#DEBUG_OPTION=-Xdebug -Xrunjdwp:transport=dt_socket,address=9999,server=y,suspend=n
2520

26-
exec "$JAVA" -cp $CLASSPATH -Dlog4j.configurationFile=file://${JUMBUNE_HOME}/resources/log4j2.xml -jar $jetty --port $PORT --stop-port 9009 --stop-key stop $warpath
21+
exec "$JAVA" -cp $CLASSPATH -Dlog4j.configurationFile=file://${JUMBUNE_HOME}/resources/log4j2.xml -jar $jetty --config ${JUMBUNE_HOME}/bin/jetty-config.xml --stop-port 9009 --stop-key stop $warpath

‎cluster-profiling/pom.xml ‎cluster-analysis/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<version>2.0</version>
1010
</parent>
1111
<groupId>org.jumbune</groupId>
12-
<artifactId>jumbune-cluster-profiling</artifactId>
12+
<artifactId>jumbune-cluster-analysis</artifactId>
1313
<version>${project.parent.version}</version>
14-
<name>cluster-profiling</name>
14+
<name>cluster-analysis</name>
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<build.number>2.0</build.number>
@@ -25,7 +25,7 @@
2525
</dependency>
2626
<dependency>
2727
<groupId>org.jumbune</groupId>
28-
<artifactId>jumbune-profiling</artifactId>
28+
<artifactId>jumbune-monitoring</artifactId>
2929
<version>${build.number}</version>
3030
</dependency>
3131
<dependency>
@@ -66,7 +66,7 @@
6666
<scope>compile</scope>
6767
</dependency>
6868
</dependencies>
69-
69+
7070
<profiles>
7171
<profile>
7272
<id>default</id>
@@ -80,7 +80,7 @@
8080
<artifactId>maven-compiler-plugin</artifactId>
8181
<configuration>
8282
<excludes>
83-
<exclude>org/jumbune/clusterprofiling/yarn/**</exclude>
83+
<exclude>org/jumbune/clusteranalysis/yarn/**</exclude>
8484
</excludes>
8585
</configuration>
8686
</plugin>
@@ -91,6 +91,6 @@
9191
<id>yarn</id>
9292
</profile>
9393
</profiles>
94-
95-
94+
95+
9696
</project>

‎cluster-profiling/src/main/java/org/jumbune/clusterprofiling/yarn/beans/ClusterMetrics.java ‎cluster-analysis/src/main/java/org/jumbune/clusteranalysis/beans/ClusterMetrics.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jumbune.clusterprofiling.yarn.beans;
1+
package org.jumbune.clusteranalysis.beans;
22

33
import javax.xml.bind.annotation.XmlElement;
44
import javax.xml.bind.annotation.XmlRootElement;

‎cluster-profiling/src/main/java/org/jumbune/clusterprofiling/beans/JobQueueBean.java ‎cluster-analysis/src/main/java/org/jumbune/clusteranalysis/beans/JobQueueBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jumbune.clusterprofiling.beans;
1+
package org.jumbune.clusteranalysis.beans;
22

33
/**
44
* The Class JobQueueBean is a pojo containing the job and queue utilization

‎cluster-profiling/src/main/java/org/jumbune/clusterprofiling/beans/LiveCapacityStats.java ‎cluster-analysis/src/main/java/org/jumbune/clusteranalysis/beans/LiveCapacityStats.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jumbune.clusterprofiling.beans;
1+
package org.jumbune.clusteranalysis.beans;
22

33
/**
44
* The Class LiveCapacityStats to dump container availability in cluster.

‎cluster-profiling/src/main/java/org/jumbune/clusterprofiling/beans/RackAwareStats.java ‎cluster-analysis/src/main/java/org/jumbune/clusteranalysis/beans/RackAwareStats.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jumbune.clusterprofiling.beans;
1+
package org.jumbune.clusteranalysis.beans;
22

33
public class RackAwareStats {
44

0 commit comments

Comments
 (0)