lizardfs/0001-master-Fix-high-cpu-us...

44 lines
1.2 KiB
Diff

From f75fdceedb7ab91a2af2a26932f7f4a57000c8d1 Mon Sep 17 00:00:00 2001
From: Hazeman <hazeman@skytechnology.pl>
Date: Thu, 11 May 2017 10:06:11 +0200
Subject: [PATCH 1/2] master: Fix high cpu usage in fs_periodic_file_test
This commit fixes high cpu usage in fs_periodic_file_test.
Fixes #547
Change-Id: Ia93173dd0f358f3ff606c7ebb5848f2b786b2158
---
src/master/filesystem_periodic.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/master/filesystem_periodic.cc b/src/master/filesystem_periodic.cc
index 61b60d9..cb42ced 100644
--- a/src/master/filesystem_periodic.cc
+++ b/src/master/filesystem_periodic.cc
@@ -332,9 +332,6 @@ void fs_process_file_test() {
static uint32_t unavailreservedfiles = 0;
FSNode *f;
- if (eventloop_time() <= gTestStartTime) {
- return;
- }
if (gFileTestLoopIndex == 0) {
fsinfo_files = files;
@@ -474,6 +471,11 @@ void fs_process_file_test() {
}
void fs_periodic_file_test() {
+ if (eventloop_time() <= gTestStartTime) {
+ gFileTestLoopBucketLimit = 0;
+ return;
+ }
+
if (gFileTestLoopBucketLimit == 0) {
gFileTestLoopBucketLimit = NODEHASHSIZE / gFileTestLoopTime;
fs_process_file_test();
--
2.9.3