From 6e7e15750ddde04e28c40fd7c6fa2c785ec34b53 Mon Sep 17 00:00:00 2001
From: openeuler_bot <zhaiwenjie1@huawei.com>
Date: Thu, 31 Jul 2025 01:47:54 +0000
Subject: [PATCH] 24.03-lts-sp1 update atlas to 3.11.41

---
 .../atlas/3.11.41/24.03-lts-sp1/Dockerfile    | 30 +++++++++
 .../3.11.41/24.03-lts-sp1/atlas_config.patch  | 64 +++++++++++++++++++
 Bigdata/atlas/meta.yml                        |  3 +
 3 files changed, 97 insertions(+)
 create mode 100644 Bigdata/atlas/3.11.41/24.03-lts-sp1/Dockerfile
 create mode 100644 Bigdata/atlas/3.11.41/24.03-lts-sp1/atlas_config.patch

diff --git a/Bigdata/atlas/3.11.41/24.03-lts-sp1/Dockerfile b/Bigdata/atlas/3.11.41/24.03-lts-sp1/Dockerfile
new file mode 100644
index 00000000..c46931a9
--- /dev/null
+++ b/Bigdata/atlas/3.11.41/24.03-lts-sp1/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:24.03-lts-sp1
+FROM $BASE
+
+ARG VERSION=3.11.41
+
+RUN yum install -y git maven java-1.8.0-openjdk-devel make gcc g++ hostname && \
+    yum clean all
+
+ENV MAVEN_OPTS="-Xms8g -Xmx8g"
+RUN git clone -b release-${VERSION} https://github.com/apache/atlas.git && \
+    cd /atlas && \
+    mvn clean install -DskipTests -T 2C && \
+    mvn clean \
+        -Dhttps.protocols=TLSv1.2 \
+        -DskipTests \
+        -Drat.skip=true \
+        package -Pdist,embedded-hbase-solr && \
+    mkdir -p /atlas-server && \
+    tar -xzvf /atlas/distro/target/apache-atlas-${VERSION}-server.tar.gz -C /atlas-server --strip-components=1 && \
+    echo -e 'export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk' >> /atlas-server/conf/atlas-env.sh && \
+    mkdir -p /atlas-server/hbase/conf/ && \
+    cp /atlas/dev-support/atlas-docker/scripts/hbase-site.xml /atlas-server/hbase/conf/ && \
+    rm -rf /atlas
+
+COPY atlas_config.patch /atlas-server/
+WORKDIR /atlas-server
+RUN yum install -y patch && \
+    patch -p1 < atlas_config.patch
+
+EXPOSE 21000
\ No newline at end of file
diff --git a/Bigdata/atlas/3.11.41/24.03-lts-sp1/atlas_config.patch b/Bigdata/atlas/3.11.41/24.03-lts-sp1/atlas_config.patch
new file mode 100644
index 00000000..94e0341c
--- /dev/null
+++ b/Bigdata/atlas/3.11.41/24.03-lts-sp1/atlas_config.patch
@@ -0,0 +1,64 @@
+--- a/bin/atlas_config.py   2025-06-28 10:16:09.154265752 +0000
++++ b/bin/atlas_config.py   2025-06-28 10:00:31.479221040 +0000
+@@ -529,15 +529,17 @@
+
+ def wait_for_startup(confdir, wait):
+     count = 0
++    started = False
+     host = get_atlas_url_host(confdir)
+     port = get_atlas_url_port(confdir)
+-    while True:
++    pid_file = pidFile(atlasDir())
++    while not started:
+         try:
+             s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+             s.settimeout(1)
+             s.connect((host, int(port)))
+             s.close()
+-            break
++            started = True
+         except Exception as e:
+             # Wait for 1 sec before next ping
+             sys.stdout.write('.')
+@@ -546,6 +548,14 @@
+
+         if count > wait:
+             s.close()
++            sys.stdout.write('\nAtlas Web-UI startup timed out! But, wait for it...')
++            sys.stdout.flush()
++            break
++
++        if not os.path.exists(pid_file):
++            sys.stdout.write('\nApache Atlas startup failed!\nCheck logs: /apache-atlas/logs/application.log')
++            sys.stdout.flush()
++            exit()
+             break
+
+         count = count + 1
+@@ -584,14 +594,14 @@
+
+     if zk_url is None:
+         if port is None:
+-            cmd = [os.path.join(dir, solrScript), action]
++            cmd = [os.path.join(dir, solrScript), action, '-force']
+         else:
+-            cmd = [os.path.join(dir, solrScript), action, '-p', str(port)]
++            cmd = [os.path.join(dir, solrScript), action, '-force', '-p', str(port)]
+     else:
+         if port is None:
+-            cmd = [os.path.join(dir, solrScript), action, '-z', zk_url]
++            cmd = [os.path.join(dir, solrScript), action, '-force', '-z', zk_url]
+         else:
+-            cmd = [os.path.join(dir, solrScript), action, '-z', zk_url, '-p', port]
++            cmd = [os.path.join(dir, solrScript), action, '-force', '-z', zk_url, '-p', port]
+
+     if homedir is not None:
+         if not os.path.exists(homedir) :
+@@ -614,7 +624,7 @@
+     if IS_WINDOWS:
+         solrScript = "solr.cmd"
+
+-    cmd = [os.path.join(dir, solrScript), 'create', '-c', index, '-d', confdir,  '-shards',  solrShards(),  '-replicationFactor', solrReplicationFactor()]
++    cmd = [os.path.join(dir, solrScript), 'create', '-c', index, '-d', confdir,  '-shards',  solrShards(),  '-replicationFactor', solrReplicationFactor(), '-force']
+
+     return runProcess(cmd, logdir, False, wait)
diff --git a/Bigdata/atlas/meta.yml b/Bigdata/atlas/meta.yml
index 1a89f845..91e95eac 100644
--- a/Bigdata/atlas/meta.yml
+++ b/Bigdata/atlas/meta.yml
@@ -1,2 +1,5 @@
 2.4.0-oe2403sp1:
   path: 2.4.0/24.03-lts-sp1/Dockerfile
+
+3.11.41-oe2403sp1:
+  path: 3.11.41/24.03-lts-sp1/Dockerfile
\ No newline at end of file
-- 
Gitee