This reverts commit 4b08be77c98a4c15b8b3d634fab4ffc24bf4ef38. Add file lock when doing online merging only and associated test.
This reverts commit 4b08be77c98a4c15b8b3d634fab4ffc24bf4ef38. Add file lock when doing online merging only and associated test.