You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2023/02/06 19:26:47 UTC
[hudi] 01/02: [HUDI-5638] Activate platform service profile when deploy (#7858)
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch release-0.13.0
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 4acb016afea016a885236ced64227de2fe613c53
Author: Shiyan Xu <27...@users.noreply.github.com>
AuthorDate: Sun Feb 5 23:44:10 2023 -0600
[HUDI-5638] Activate platform service profile when deploy (#7858)
---
.github/workflows/bot.yml | 8 +++++---
.../hudi-metaserver/src/main/thrift/bin/thrift_binary.sh | 16 ++++------------
.../src/main/thrift/bin/thrift_in_docker.sh | 2 ++
.../src/main/thrift/bin/thrift_in_mac_m1.sh | 0
packaging/hudi-flink-bundle/pom.xml | 6 ++++++
packaging/hudi-spark-bundle/pom.xml | 6 ++++++
6 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 065c4b7a5d5..48856692c88 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -19,7 +19,7 @@ on:
- master
- 'release-*'
env:
- MVN_ARGS: -ntp -B -V -Pwarn-log -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=warn -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.dependency=warn
+ MVN_ARGS: -e -ntp -B -V -Pwarn-log -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=warn -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.dependency=warn
jobs:
test-spark:
@@ -127,8 +127,10 @@ jobs:
SPARK_PROFILE: ${{ matrix.sparkProfile }}
SCALA_PROFILE: 'scala-2.12'
run: |
- mvn clean package -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" -Pintegration-tests -DskipTests=true -Phudi-platform-service $MVN_ARGS
- mvn clean package -D"$SCALA_PROFILE" -D"$FLINK_PROFILE" -pl packaging/hudi-flink-bundle -am -Davro.version=1.10.0 -DskipTests=true $MVN_ARGS
+ mvn clean package -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" -DdeployArtifacts=true -DskipTests=true $MVN_ARGS
+ # TODO remove the sudo below. It's a needed workaround as detailed in HUDI-5708.
+ sudo chown -R "$USER:$(id -g -n)" hudi-platform-service/hudi-metaserver/target/generated-sources
+ mvn clean package -D"$SCALA_PROFILE" -D"$FLINK_PROFILE" -DdeployArtifacts=true -DskipTests=true $MVN_ARGS -pl packaging/hudi-flink-bundle -am -Davro.version=1.10.0
- name: IT - Bundle Validation
env:
FLINK_PROFILE: ${{ matrix.flinkProfile }}
diff --git a/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_binary.sh b/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_binary.sh
index 24f2282a2a8..d40eb978a7b 100755
--- a/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_binary.sh
+++ b/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_binary.sh
@@ -16,24 +16,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# Usage: ./scripts/checkout_pr.sh
-#
-# Checkout a PR given the PR number into a local branch. PR branches are named
-# using the convention "pull/<PR_NUMBER>", to enable pr_push_command.sh to work
-# in tandem.
-#
-
SUBDIR=../src/main/thrift/bin
OS_VERSION=$1
M1_MAC='m1_mac'
DOCKER='docker'
if [ "$OS_VERSION" = "$M1_MAC" ]
then
- sh $SUBDIR/thrift_in_mac_m1.sh
+ $SUBDIR/thrift_in_mac_m1.sh
elif [ "$OS_VERSION" = "$DOCKER" ]
then
- sh $SUBDIR/thrift_in_docker.sh
+ $SUBDIR/thrift_in_docker.sh
else
- sh $SUBDIR/thrift_in_docker.sh
-fi
\ No newline at end of file
+ $SUBDIR/thrift_in_docker.sh
+fi
diff --git a/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_docker.sh b/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_docker.sh
index 2574d805a65..7ff2174ff22 100755
--- a/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_docker.sh
+++ b/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_docker.sh
@@ -26,4 +26,6 @@ docker pull $THRIFT_IMAGE
printf "====== INSTALL THRIFT END ======\n"
printf "====== COMPILE THRIFT SOURCE FILE START ======\n"
docker run -v "$THRIFT_FILE_PATH:/thrift" -v "$THRIFT_OUT_PATH:/output" $THRIFT_IMAGE thrift -o /output/ --gen java /thrift/hudi-metaserver.thrift
+printf "====== CHANGE OWNER TO CURRENT USER ======\n"
+chown -R "$USER:$(id -g -n)" $THRIFT_OUT_PATH
printf "====== COMPILE THRIFT SOURCE FILE END ======\n"
diff --git a/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_mac_m1.sh b/hudi-platform-service/hudi-metaserver/src/main/thrift/bin/thrift_in_mac_m1.sh
old mode 100644
new mode 100755
diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
index df37661c52f..25091246bb3 100644
--- a/packaging/hudi-flink-bundle/pom.xml
+++ b/packaging/hudi-flink-bundle/pom.xml
@@ -643,6 +643,12 @@
</profile>
<profile>
<id>hudi-platform-service</id>
+ <activation>
+ <property>
+ <name>deployArtifacts</name>
+ <value>true</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.apache.hudi</groupId>
diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
index 018ed0b2658..d67021276be 100644
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -346,6 +346,12 @@
</profile>
<profile>
<id>hudi-platform-service</id>
+ <activation>
+ <property>
+ <name>deployArtifacts</name>
+ <value>true</value>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.apache.hudi</groupId>