BIGTOP-4302: Install Flink with tarball

apache · Dec 10, 2024 · d674516 · d674516
1 parent faa3f19
commit d674516
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 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
@@ -28,7 +28,7 @@
 
         <components>
             <component>
-                <name>flink_history_server</name>
+                <name>flink_historyserver</name>
                 <display-name>Flink History Server</display-name>
                 <category>server</category>
                 <cardinality>1+</cardinality>

diff --git a/.../src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java b/.../src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkClientScript.java
@@ -26,13 +26,23 @@
 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/...in/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java b/...in/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkHistoryServerScript.java
@@ -27,12 +27,22 @@
 
 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 ShellResult status(Params params) {
 
     @Override
     public String getComponentName() {
-        return "flink_history_server";
+        return "flink_historyserver";
     }
 }
diff --git a/...bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java b/...bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkParams.java
@@ -120,13 +120,8 @@ public Map<String, Object> flinkLog4jSessionProperties() {
         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/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java b/...-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/flink/FlinkSetup.java
@@ -34,7 +34,8 @@
 @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 +46,6 @@ public static ShellResult config(Params params) {
         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 +54,6 @@ public static ShellResult config(Params params) {
                 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 +62,6 @@ public static ShellResult config(Params params) {
                 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 +70,6 @@ public static ShellResult config(Params params) {
                 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 +78,6 @@ public static ShellResult config(Params params) {
                 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 +86,9 @@ public static ShellResult config(Params params) {
                 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();
     }
 }