Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PH] Performance harness Log Number of Forks and Forked Blocks #618

Merged
merged 4 commits into from
Jan 9, 2023
Merged

[PH] Performance harness Log Number of Forks and Forked Blocks #618

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fba333b
report forks and forked blocks in performance harness
ClaytonCalabrese Jan 5, 2023
186a0b0
revert unintended change made to get logs for testing.
ClaytonCalabrese Jan 5, 2023
15061f9
merge from feature branch
ClaytonCalabrese Jan 5, 2023
22b60a3
add a +1 to how many forked blocks are logged
ClaytonCalabrese Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions tests/performance_tests/log_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ def __init__(self):
self.totalElapsed = 0
self.totalTime = 0
self.totalLatency = 0
self.forkedBlocks = []
def __eq__(self, other):
return self.startBlock == other.startBlock and\
self.ceaseBlock == other.ceaseBlock and\
Expand Down Expand Up @@ -182,7 +183,8 @@ def selectedOpen(path):
def scrapeLog(data, path):
selectedopen = selectedOpen(path)
with selectedopen(path, 'rt') as f:
blockResult = re.findall(r'Received block ([0-9a-fA-F]*).* #(\d+) .*trxs: (\d+)(.*)', f.read())
line = f.read()
blockResult = re.findall(r'Received block ([0-9a-fA-F]*).* #(\d+) .*trxs: (\d+)(.*)', line)
if data.startBlock is None:
data.startBlock = 2
if data.ceaseBlock is None:
Expand All @@ -201,6 +203,9 @@ def scrapeLog(data, path):
data.updateTotal(int(value[2]), 0, 0, 0, 0, int(v2Logging[0]))
else:
print("Error: Unknown log format")
forks = re.findall(r'switching forks from ([0-9a-fA-F]+) \(block number (\d+)\) to ([0-9a-fA-F]+) \(block number (\d+)\)', line)
for fork in forks:
data.forkedBlocks.append(int(fork[1]) - int(fork[3]) + 1)

def scrapeTrxGenLog(trxSent, path):
selectedopen = selectedOpen(path)
Expand Down Expand Up @@ -356,7 +361,7 @@ def calcTrxLatencyCpuNetStats(trxDict : dict, blockDict: dict):
basicStats(float(np.min(npLatencyCpuNetList[:,2])), float(np.max(npLatencyCpuNetList[:,2])), float(np.average(npLatencyCpuNetList[:,2])), float(np.std(npLatencyCpuNetList[:,2])), len(npLatencyCpuNetList))

def createReport(guide: chainBlocksGuide, tpsTestConfig: TpsTestConfig, tpsStats: stats, blockSizeStats: stats, trxLatencyStats: basicStats, trxCpuStats: basicStats,
trxNetStats: basicStats, testStart: datetime, testFinish: datetime, argsDict: dict, completedRun: bool) -> dict:
trxNetStats: basicStats, forkedBlocks, testStart: datetime, testFinish: datetime, argsDict: dict, completedRun: bool) -> dict:
report = {}
report['completedRun'] = completedRun
report['testStart'] = testStart
Expand All @@ -372,6 +377,8 @@ def createReport(guide: chainBlocksGuide, tpsTestConfig: TpsTestConfig, tpsStats
report['Analysis']['TrxCPU'] = asdict(trxCpuStats)
report['Analysis']['TrxLatency'] = asdict(trxLatencyStats)
report['Analysis']['TrxNet'] = asdict(trxNetStats)
report['Analysis']['ForkedBlocks'] = forkedBlocks
report['Analysis']['NumForks'] = len(forkedBlocks)
report['args'] = argsDict
report['env'] = {'system': system(), 'os': os.name, 'release': release(), 'logical_cpu_count': os.cpu_count()}
report['nodeosVersion'] = Utils.getNodeosVersion()
Expand Down Expand Up @@ -423,7 +430,7 @@ def calcAndReport(data: chainData, tpsTestConfig: TpsTestConfig, artifacts: Arti
finish = datetime.utcnow()

report = createReport(guide=guide, tpsTestConfig=tpsTestConfig, tpsStats=tpsStats, blockSizeStats=blkSizeStats, trxLatencyStats=trxLatencyStats,
trxCpuStats=trxCpuStats, trxNetStats=trxNetStats, testStart=start, testFinish=finish, argsDict=argsDict, completedRun=completedRun)
trxCpuStats=trxCpuStats, trxNetStats=trxNetStats, forkedBlocks=data.forkedBlocks, testStart=start, testFinish=finish, argsDict=argsDict, completedRun=completedRun)
return report

def exportReportAsJSON(report: json, exportPath):
Expand Down