hcq/openGauss-OM
hcq/openGauss-OM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配社区内核guc读取静态文件参数

Browse Source
This commit is contained in:
hangjin2020 2020-12-18 17:52:57 +08:00
parent b254a7b32d
commit e2d3ac3642
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
script/gspylib/common/DbClusterInfo.py
View File

@ -1410,9 +1410,9 @@ class dbClusterInfo():
"""
try:
with open(staticConfigFile, "rb") as fp:
info = fp.read(28)
info = fp.read(32)
(crc, lenth, version, currenttime, nodeNum,
localNodeId) = struct.unpack("=IIIqiI", info)
localNodeId) = struct.unpack("=qIIqiI", info)
except Exception as e:
raise Exception(
ErrorCode.GAUSS_512["GAUSS_51236"] + " Error: \n%s." % str(e))
@ -2221,9 +2221,9 @@ class dbClusterInfo():
try:
# read static_config_file
fp = open(staticConfigFile, "rb")
info = fp.read(28)
info = fp.read(32)
(crc, lenth, version, currenttime, nodeNum,
localNodeId) = struct.unpack("=IIIqiI", info)
localNodeId) = struct.unpack("=qIIqiI", info)
self.version = version
self.installTime = currenttime
self.localNodeId = localNodeId
@ -2284,8 +2284,8 @@ class dbClusterInfo():
input : file
output : Object
"""
info = fp.read(72)
(crc, nodeId, nodeName) = struct.unpack("=II64s", info)
info = fp.read(76)
(crc, nodeId, nodeName) = struct.unpack("=qI64s", info)
nodeName = nodeName.decode().strip('\x00')
dbNode = dbNodeInfo(nodeId, nodeName)
info = fp.read(68)
@ -2572,9 +2572,9 @@ class dbClusterInfo():
try:
# read cluster info from static config file
fp = open(staticConfigFile, "rb")
info = fp.read(28)
info = fp.read(32)
(crc, lenth, version, currenttime, nodeNum,
localNodeId) = struct.unpack("=IIIqiI", info)
localNodeId) = struct.unpack("=qIIqiI", info)
if (version <= 100):
raise Exception(ErrorCode.GAUSS_516["GAUSS_51637"]
% ("cluster static config version[%s]"
@ -4590,7 +4590,7 @@ class dbClusterInfo():
info += struct.pack("I", localNodeId)
crc = binascii.crc32(info)
info = struct.pack("I", crc) + info
info = struct.pack("q", crc) + info
fp.write(info)
for dbNode in dbNodes:
@ -4649,7 +4649,7 @@ class dbClusterInfo():
info += struct.pack("I", 0)
crc = binascii.crc32(info)
return struct.pack("I", crc) + info
return struct.pack("q", crc) + info
def __packNodeInfoForLC(self, dbNode):
"""
@ -4672,7 +4672,7 @@ class dbClusterInfo():
info += struct.pack("I", 0)
crc = binascii.crc32(info)
return struct.pack("I", crc) + info
return struct.pack("q", crc) + info
def __packEtcdInfo(self, dbNode):
"""
@ -6092,7 +6092,7 @@ class dbClusterInfo():
# node count
info += struct.pack("I", len(self.dbNodes))
crc = binascii.crc32(info)
info = struct.pack("I", crc) + info
info = struct.pack("q", crc) + info
fp.write(info)
primaryDnNum = 0
for dbNode in self.dbNodes:
@ -6195,7 +6195,7 @@ class dbClusterInfo():
info += struct.pack("I", 0)
info += struct.pack("I", 0)
crc = binascii.crc32(info)
return (primaryNum, struct.pack("I", crc) + info)
return (primaryNum, struct.pack("q", crc) + info)
def __getClusterSwitchTime(self, dynamicConfigFile):
"""
@ -6207,9 +6207,9 @@ class dbClusterInfo():
fp = None
try:
fp = open(dynamicConfigFile, "rb")
info = fp.read(24)
info = fp.read(28)
(crc, lenth, version, switchTime, nodeNum) = \
struct.unpack("=IIIqi", info)
struct.unpack("=qIIqi", info)
fp.close()
except Exception as e:
if fp:
@ -6345,9 +6345,9 @@ class dbClusterInfo():
dynamicConfigFile = self.__getDynamicConfig(user)
# read dynamic_config_file
fp = open(dynamicConfigFile, "rb")
info = fp.read(24)
info = fp.read(28)
(crc, lenth, version, currenttime, nodeNum) = \
struct.unpack("=IIIqi", info)
struct.unpack("=qIIqi", info)
totalMaterDnNum = 0
for i in range(nodeNum):
offset = (fp.tell() // PAGE_SIZE + 1) * PAGE_SIZE
@ -6366,8 +6366,8 @@ class dbClusterInfo():
dynamicConfigFile + " Error:\n" + str(e))
def __unpackDynamicNodeInfo(self, fp):
info = fp.read(72)
(crc, nodeId, nodeName) = struct.unpack("=II64s", info)
info = fp.read(76)
(crc, nodeId, nodeName) = struct.unpack("=qI64s", info)
nodeName = nodeName.decode().strip('\x00')
dbNode = dbNodeInfo(nodeId, nodeName)
info = fp.read(4)