fix server keeper concurrency issue
merge