Skip to content

Commit b50fa78

Browse files
Merge pull request #2943 from actiontech/fix_plugin_start_error
fix: failed to start oracle plugin
2 parents 3e695e6 + 5c55492 commit b50fa78

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

build/sqled.spec

+1-13
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ if [ $? -eq 0 ]; then
9393
-e "s|User=|User=actiontech-universe|g" \
9494
-e "s|ExecStart=|ExecStart=/bin/sh -c 'exec $RPM_INSTALL_PREFIX\/bin\/sqled --config $RPM_INSTALL_PREFIX\/etc\/sqled.yml --pidfile=$RPM_INSTALL_PREFIX\/sqled.pid >>$RPM_INSTALL_PREFIX\/std.log 2>\&1'|g" \
9595
-e "s|WorkingDirectory=|WorkingDirectory=$RPM_INSTALL_PREFIX|g" \
96+
-e "s|Environment=|Environment=SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX\/jdk|g" \
9697
$RPM_INSTALL_PREFIX/scripts/sqled.systemd > /lib/systemd/system/sqled.service
9798
systemctl daemon-reload
9899
systemctl enable sqled.service
@@ -149,19 +150,6 @@ max_lag_millis=1500
149150
heartbeat_interval_millis=100
150151
EOF
151152

152-
# 检查 .bashrc 文件是否存在
153-
if [ -f ~/.bashrc ]; then
154-
if grep -q "^export SQLE_JAVA_HOME=" ~/.bashrc; then
155-
# 如果 SQLE_JAVA_HOME 已经存在,则更新其值
156-
sed -i "s|^export SQLE_JAVA_HOME=.*|export SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX/jdk|" ~/.bashrc
157-
else
158-
echo "export SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX/jdk" >> ~/.bashrc
159-
fi
160-
else
161-
echo "warn: .bashrc file not found."
162-
fi
163-
source ~/.bashrc
164-
165153
#chown
166154
chown -R %{user_name}: $RPM_INSTALL_PREFIX
167155

build/sqled_with_dms.spec

+1-13
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ if [ $? -eq 0 ]; then
101101
-e "s|User=|User=actiontech-universe|g" \
102102
-e "s|ExecStart=|ExecStart=/bin/sh -c 'exec $RPM_INSTALL_PREFIX\/bin\/sqled --config $RPM_INSTALL_PREFIX\/etc\/config.yaml --pidfile=$RPM_INSTALL_PREFIX\/sqled.pid >>$RPM_INSTALL_PREFIX\/std.log 2>\&1'|g" \
103103
-e "s|WorkingDirectory=|WorkingDirectory=$RPM_INSTALL_PREFIX|g" \
104+
-e "s|Environment=|Environment=SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX\/jdk|g" \
104105
$RPM_INSTALL_PREFIX/scripts/sqled.systemd > /lib/systemd/system/sqled.service
105106
sed -e "s|PIDFile=|PIDFile=$RPM_INSTALL_PREFIX\/dms.pid|g" \
106107
-e "s|User=|User=actiontech-universe|g" \
@@ -160,19 +161,6 @@ max_lag_millis=1500
160161
heartbeat_interval_millis=100
161162
EOF
162163

163-
# 检查 .bashrc 文件是否存在
164-
if [ -f ~/.bashrc ]; then
165-
if grep -q "^export SQLE_JAVA_HOME=" ~/.bashrc; then
166-
# 如果 SQLE_JAVA_HOME 已经存在,则更新其值
167-
sed -i "s|^export SQLE_JAVA_HOME=.*|export SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX/jdk|" ~/.bashrc
168-
else
169-
echo "export SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX/jdk" >> ~/.bashrc
170-
fi
171-
else
172-
echo "warn: .bashrc file not found."
173-
fi
174-
source ~/.bashrc
175-
176164
#chown
177165
chown -R %{user_name}: $RPM_INSTALL_PREFIX
178166

scripts/sqled.systemd

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ After=network.target
66
WantedBy=multi-user.target
77

88
[Service]
9+
Environment=
910
User=
1011
LimitNOFILE=65535
1112
LimitNPROC=65535

0 commit comments

Comments
 (0)