From bfd6f43eb98c81e178770939173975e25754b83b Mon Sep 17 00:00:00 2001 From: lexin184383 Date: Fri, 1 Mar 2024 11:06:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=A6cm=E7=9A=84500=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=9B=86=E7=BE=A4=E6=89=A9=E5=AE=B9=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=89=A7=E8=A1=8Cgs=5Fpost?= =?UTF-8?q?uninstall=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/impl/expansion/ExpansionImpl.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script/impl/expansion/ExpansionImpl.py b/script/impl/expansion/ExpansionImpl.py index efe8da68..f9590c38 100644 --- a/script/impl/expansion/ExpansionImpl.py +++ b/script/impl/expansion/ExpansionImpl.py @@ -113,8 +113,10 @@ class ExpansionImpl(): self.commonGsCtl = GsCtlCommon(expansion) self.tempFileDir = "/tmp/gs_expansion_%s" % (currentTime) - self.remote_pkg_dir = os.path.join(self.tempFileDir, "pkg") + dirName = os.path.dirname(os.path.realpath(__file__)) + self.remote_pkg_dir = os.path.normath(os.path.join(dirName, "./../../../")) self.logger.debug("tmp expansion dir is %s ." % self.tempFileDir) + self.logger.debug("remote_pkg_dir is %s ." % self.remote_pkg_dir) # primary's wal_keep_segments value self.walKeepSegments = -1 @@ -179,8 +181,8 @@ class ExpansionImpl(): for host in self.context.newHostList: sshTool = SshTool([host], timeout=time_out) # mkdir package dir and send package to remote nodes. - sshTool.executeCommand("umask 0022;mkdir -m a+x -p %s; chown %s:%s %s" % \ - (self.remote_pkg_dir, self.user, self.group, self.tempFileDir), + sshTool.executeCommand("umask 0022;mkdir -m a+x -p %s; mkdir -m a+x -p %s; chown %s:%s %s" % \ + (self.remote_pkg_dir, self.tempFileDir, self.user, self.group, self.tempFileDir), DefaultValue.SUCCESS, [host]) if send_pkg: for file in pkgfiles: -- Gitee From a6b004f40da97daafdf73996360ae75ee7fd391d Mon Sep 17 00:00:00 2001 From: lexin184383 Date: Fri, 1 Mar 2024 14:03:16 +0800 Subject: [PATCH 2/2] code check --- script/impl/expansion/ExpansionImpl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/impl/expansion/ExpansionImpl.py b/script/impl/expansion/ExpansionImpl.py index f9590c38..08b45790 100644 --- a/script/impl/expansion/ExpansionImpl.py +++ b/script/impl/expansion/ExpansionImpl.py @@ -113,8 +113,8 @@ class ExpansionImpl(): self.commonGsCtl = GsCtlCommon(expansion) self.tempFileDir = "/tmp/gs_expansion_%s" % (currentTime) - dirName = os.path.dirname(os.path.realpath(__file__)) - self.remote_pkg_dir = os.path.normath(os.path.join(dirName, "./../../../")) + dir_name = os.path.dirname(os.path.realpath(__file__)) + self.remote_pkg_dir = os.path.normath(os.path.join(dir_name, "./../../../")) self.logger.debug("tmp expansion dir is %s ." % self.tempFileDir) self.logger.debug("remote_pkg_dir is %s ." % self.remote_pkg_dir) # primary's wal_keep_segments value -- Gitee