diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 6f235b2156f3..21249033f992 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -4479,6 +4479,13 @@ public void flushMasterStore() throws IOException {
       }
     }
     masterRegion.flush(true);
+
+    try {
+      masterRegion.requestRollAll();
+      masterRegion.waitUntilWalRollFinished();
+    } catch (Exception e) {
+      throw new IOException("Error rolling HMaster WAL", e);
+    }
     if (this.cpHost != null) {
       try {
         cpHost.postMasterStoreFlush();
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegion.java
index 97447e37b7c4..b2453f02129a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegion.java
@@ -19,7 +19,6 @@
 
 import static org.apache.hadoop.hbase.HConstants.HREGION_LOGDIR_NAME;
 
-import com.google.errorprone.annotations.RestrictedApi;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
@@ -248,14 +247,10 @@ public FlushResult flush(boolean force) throws IOException {
     }
   }
 
-  @RestrictedApi(explanation = "Should only be called in tests", link = "",
-      allowedOnPath = ".*/src/test/.*")
   public void requestRollAll() {
     walRoller.requestRollAll();
   }
 
-  @RestrictedApi(explanation = "Should only be called in tests", link = "",
-      allowedOnPath = ".*/src/test/.*")
   public void waitUntilWalRollFinished() throws InterruptedException {
     walRoller.waitUntilWalRollFinished();
   }