Issue #5704: Recovery test code
Issue #2010: Repair the scaling failure and some parameters may be failure problem