Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMBARI-26131:Fix ambari-metrics-collector service check failed and resolve jar conflict problem #135

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

AMBARI-26131:Fix ambari-metrics-collector service check failed and resolve jar conflict problem #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39680e4
1.fix jar package conflict problem
xijunmu Sep 9, 2024
022ccc2
1.upgrade phoenix to 2.4-5.1.3
xijunmu Sep 9, 2024
bc70960
remove useless commented
xijunmu Sep 10, 2024
ab43040
fix unit test failures
xijunmu Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ambari-metrics-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,22 +220,13 @@
<exclude>*tests.jar</exclude>
<exclude>findbugs*.jar</exclude>
<exclude>jdk.tools*.jar</exclude>
<exclude>hadoop*.jar</exclude>
<exclude>hbase*.jar</exclude>
</excludes>
</source>
<source>
<location>
${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
</location>
</source>
<source>
<location>${collector.dir}/target/embedded/${hbase.folder}/lib</location>
<includes>
<include>hadoop*.jar</include>
<include>hbase*.jar</include>
</includes>
</source>
</sources>
</mapping>
<mapping>
Expand Down
3 changes: 1 addition & 2 deletions ambari-metrics-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -103,7 +103,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
1 change: 0 additions & 1 deletion ambari-metrics-flume-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ limitations under the License.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ambari-metrics-hadoop-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ limitations under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.1</version>
<version>2.8.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion ambari-metrics-host-aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
Expand Down
111 changes: 109 additions & 2 deletions ambari-metrics-timelineservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,54 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
</exclusion>
<exclusion>
<artifactId>hbase-mapreduce</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-hadoop-compat</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-hadoop2-compat</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-common</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-protocol</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-protocol-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-metrics-api</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-zookeeper</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-shaded-miscellaneous</artifactId>
<groupId>org.apache.hbase.thirdparty</groupId>
</exclusion>
<exclusion>
<artifactId>hbase-shaded-protobuf</artifactId>
<groupId>org.apache.hbase.thirdparty</groupId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -342,6 +390,62 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-mapreduce</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.4.1</artifactId>
Expand Down Expand Up @@ -524,7 +628,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand All @@ -539,7 +642,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -788,6 +891,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/test/java/org/apache/ambari/metrics/core/timeline/AbstractMiniHBaseClusterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected static void setUpTestDriver(ReadOnlyProps serverProps, ReadOnlyProps c
}
}

private static String checkClusterInitialized(ReadOnlyProps serverProps) throws Exception {
protected static String checkClusterInitialized(ReadOnlyProps serverProps) throws Exception {
if(!clusterInitialized) {
url = setUpTestCluster(config, serverProps);
clusterInitialized = true;
Expand Down
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@
<python.ver>python3 &gt;= 3.0</python.ver>
<deb.python.ver>python3 (&gt;= 3.0)</deb.python.ver>
<slf4j.version>2.0.0</slf4j.version>
<zookeeper.version>3.5.9</zookeeper.version>
<kafka.version>2.8.1</kafka.version>
<phoenix.version>5.1.2</phoenix.version>
<hbase.version>2.4.13</hbase.version>
<zookeeper.version>3.7.2</zookeeper.version>
<kafka.version>2.8.2</kafka.version>
<phoenix.version>5.1.3</phoenix.version>
<hbase.version>2.4.17</hbase.version>
<curator.version>4.2.0</curator.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<hbase.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hbase-2.4.13-bin.tar.gz</hbase.tar>
<hbase.folder>hbase-2.4.13</hbase.folder>
<hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.4.tar.gz</hadoop.tar>
<hadoop.folder>hadoop-3.3.4</hadoop.folder>
<hadoop.version>3.3.4</hadoop.version>
<hbase.tar>https://archive.apache.org/dist/hbase/2.4.17/hbase-2.4.17-bin.tar.gz</hbase.tar>
<hbase.folder>hbase-2.4.17</hbase.folder>
<hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.3.6/hadoop-3.3.6.tar.gz</hadoop.tar>
<hadoop.folder>hadoop-3.3.6</hadoop.folder>
<hadoop.version>3.3.6</hadoop.version>
<grafana.folder>grafana-v11.1.4</grafana.folder>
<grafana.tar>https://dl.grafana.com/oss/release/grafana-11.1.4.linux-amd64.tar.gz</grafana.tar>
<phoenix.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
<phoenix.folder>phoenix-hbase-2.4-5.1.2-bin</phoenix.folder>
<phoenix.tar>https://archive.apache.org/dist/phoenix/phoenix-5.1.3/phoenix-hbase-2.4-5.1.3-bin.tar.gz</phoenix.tar>
<phoenix.folder>phoenix-hbase-2.4-5.1.3-bin</phoenix.folder>
<resmonitor.install.dir>/usr/lib/python3.9/site-packages/resource_monitoring</resmonitor.install.dir>
<powermock.version>1.6.2</powermock.version>
<distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
Expand Down Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Loading