This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new da371202 BIGTOP-4302: Install Flink with tarball (#124)
da371202 is described below
commit da371202d993102613484674886a55f139c56484
Author: Zhiguo Wu <[email protected]>
AuthorDate: Tue Dec 10 22:16:50 2024 +0800
BIGTOP-4302: Install Flink with tarball (#124)
---
.../stacks/bigtop/3.3.0/services/flink/metainfo.xml | 4 ++--
.../stack/bigtop/v3_3_0/flink/FlinkClientScript.java | 12 +++++++++++-
.../bigtop/v3_3_0/flink/FlinkHistoryServerScript.java | 14 ++++++++++++--
.../stack/bigtop/v3_3_0/flink/FlinkParams.java | 7 +------
.../manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java | 19 +++++--------------
5 files changed, 31 insertions(+), 25 deletions(-)
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml
index 6fc6bbd4..4da4d6c7 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml
@@ -28,8 +28,8 @@
<components>
<component>
- <name>flink_history_server</name>
- <display-name>Flink History Server</display-name>
+ <name>flink_historyserver</name>
+ <display-name>Flink HistoryServer</display-name>
<category>server</category>
<cardinality>1+</cardinality>
<quick-link>
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java
index 38a56f84..f60a5f41 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java
@@ -26,13 +26,23 @@ import
org.apache.bigtop.manager.stack.core.spi.script.Script;
import com.google.auto.service.AutoService;
import lombok.extern.slf4j.Slf4j;
+import java.util.Properties;
+
@Slf4j
@AutoService(Script.class)
public class FlinkClientScript extends AbstractClientScript {
+ @Override
+ public ShellResult add(Params params) {
+ Properties properties = new Properties();
+ properties.setProperty(PROPERTY_KEY_SKIP_LEVELS, "1");
+
+ return super.add(params, properties);
+ }
+
@Override
public ShellResult configure(Params params) {
- return FlinkSetup.config(params);
+ return FlinkSetup.configure(params);
}
@Override
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java
index 923231a5..a769fd2c 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java
@@ -27,12 +27,22 @@ import
org.apache.bigtop.manager.stack.core.utils.linux.LinuxOSUtils;
import com.google.auto.service.AutoService;
+import java.util.Properties;
+
@AutoService(Script.class)
public class FlinkHistoryServerScript extends AbstractServerScript {
+ @Override
+ public ShellResult add(Params params) {
+ Properties properties = new Properties();
+ properties.setProperty(PROPERTY_KEY_SKIP_LEVELS, "1");
+
+ return super.add(params, properties);
+ }
+
@Override
public ShellResult configure(Params params) {
- return FlinkSetup.config(params);
+ return FlinkSetup.configure(params);
}
@Override
@@ -68,6 +78,6 @@ public class FlinkHistoryServerScript extends
AbstractServerScript {
@Override
public String getComponentName() {
- return "flink_history_server";
+ return "flink_historyserver";
}
}
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java
index 70db4fad..f7c04857 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java
@@ -120,13 +120,8 @@ public class FlinkParams extends BigtopParams {
return configurations;
}
- @Override
- public String confDir() {
- return "/etc/flink/conf";
- }
-
public String hadoopConfDir() {
- return "/etc/hadoop/conf";
+ return hadoopHome() + "/etc/hadoop";
}
public String hadoopHome() {
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java
index 9256b176..c9d79d17 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java
@@ -20,7 +20,6 @@ package org.apache.bigtop.manager.stack.bigtop.v3_3_0.flink;
import org.apache.bigtop.manager.common.constants.Constants;
import org.apache.bigtop.manager.common.shell.ShellResult;
-import org.apache.bigtop.manager.stack.bigtop.utils.HdfsUtil;
import org.apache.bigtop.manager.stack.core.spi.param.Params;
import org.apache.bigtop.manager.stack.core.utils.linux.LinuxFileUtils;
@@ -34,7 +33,8 @@ import java.text.MessageFormat;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class FlinkSetup {
- public static ShellResult config(Params params) {
+ public static ShellResult configure(Params params) {
+ log.info("Configuring Flink");
FlinkParams flinkParams = (FlinkParams) params;
String flinkUser = params.user();
String flinkGroup = params.group();
@@ -45,8 +45,6 @@ public class FlinkSetup {
LinuxFileUtils.createDirectories(
flinkParams.getFlinkPidDir(), flinkUser, flinkGroup,
Constants.PERMISSION_755, true);
- // log4j.properties
- log.info("Generating [{}/log4j.properties] file", confDir);
LinuxFileUtils.toFileByTemplate(
flinkParams.getFlinkLog4jPropertiesContent(),
MessageFormat.format("{0}/log4j.properties", confDir),
@@ -55,8 +53,6 @@ public class FlinkSetup {
Constants.PERMISSION_644,
flinkParams.getGlobalParamsMap());
- // log4j-cli.properties
- log.info("Generating [{}/log4j-cli.properties] file", confDir);
LinuxFileUtils.toFileByTemplate(
flinkParams.getFlinkLog4jCLiPropertiesContent(),
MessageFormat.format("{0}/log4j-cli.properties", confDir),
@@ -65,8 +61,6 @@ public class FlinkSetup {
Constants.PERMISSION_644,
flinkParams.getGlobalParamsMap());
- // log4j-console.properties
- log.info("Generating [{}/log4j-console.properties] file", confDir);
LinuxFileUtils.toFileByTemplate(
flinkParams.getFlinkLog4jConsolePropertiesContent(),
MessageFormat.format("{0}/log4j-console.properties", confDir),
@@ -75,8 +69,6 @@ public class FlinkSetup {
Constants.PERMISSION_644,
flinkParams.getGlobalParamsMap());
- // log4j-session.properties
- log.info("Generating [{}/log4j-session.properties] file", confDir);
LinuxFileUtils.toFileByTemplate(
flinkParams.getFlinkLog4jSessionPropertiesContent(),
MessageFormat.format("{0}/log4j-session.properties", confDir),
@@ -85,8 +77,6 @@ public class FlinkSetup {
Constants.PERMISSION_644,
flinkParams.getGlobalParamsMap());
- // flink-conf.yaml
- log.info("Generating [{}/flink-conf.yaml] file", confDir);
LinuxFileUtils.toFileByTemplate(
flinkParams.getFlinkConfContent(),
MessageFormat.format("{0}/flink-conf.yaml", confDir),
@@ -95,8 +85,9 @@ public class FlinkSetup {
Constants.PERMISSION_644,
flinkParams.getGlobalParamsMap());
- HdfsUtil.createDirectory(flinkUser, "/completed-jobs");
+ // HdfsUtil.createDirectory(flinkUser, "/completed-jobs");
- return ShellResult.success("Flink Configure success!");
+ log.info("Successfully configured Flink");
+ return ShellResult.success();
}
}
