[ROCKETMQ-145][HOTFIX] Resolve concureent issue in HAService and GroupCommitService

store/src/main/java/org/apache/rocketmq/store/CommitLog.java

@@ -1101,14 +1101,14 @@ public class CommitLog {
         private volatile List<GroupCommitRequest> requestsWrite = new ArrayList<GroupCommitRequest>();
         private volatile List<GroupCommitRequest> requestsRead = new ArrayList<GroupCommitRequest>();
 
-        public void putRequest(final GroupCommitRequest request) {
-            synchronized (this) {
+        public synchronized void putRequest(final GroupCommitRequest request) {
+            synchronized (this.requestsWrite) {
                 this.requestsWrite.add(request);
+            }
             if (hasNotified.compareAndSet(false, true)) {
                 waitPoint.countDown(); // notify
             }
         }
-        }
 
         private void swapRequests() {
             List<GroupCommitRequest> tmp = this.requestsWrite;
@@ -1117,6 +1117,7 @@ public class CommitLog {
         }
 
         private void doCommit() {
+            synchronized (this.requestsRead) {
                 if (!this.requestsRead.isEmpty()) {
                     for (GroupCommitRequest req : this.requestsRead) {
                         // There may be a message in the next file, so a maximum of
@@ -1145,6 +1146,7 @@ public class CommitLog {
                     CommitLog.this.mappedFileQueue.flush(0);
                 }
             }
+        }
 
         public void run() {
             CommitLog.log.info(this.getServiceName() + " service started");

store/src/main/java/org/apache/rocketmq/store/ha/HAService.java

@@ -253,14 +253,14 @@ public class HAService {
         private volatile List<CommitLog.GroupCommitRequest> requestsWrite = new ArrayList<>();
         private volatile List<CommitLog.GroupCommitRequest> requestsRead = new ArrayList<>();
 
-        public void putRequest(final CommitLog.GroupCommitRequest request) {
-            synchronized (this) {
+        public synchronized void putRequest(final CommitLog.GroupCommitRequest request) {
+            synchronized (this.requestsWrite) {
                 this.requestsWrite.add(request);
+            }
             if (hasNotified.compareAndSet(false, true)) {
                 waitPoint.countDown(); // notify
             }
         }
-        }
 
         public void notifyTransferSome() {
             this.notifyTransferObject.wakeup();
@@ -273,6 +273,7 @@ public class HAService {
         }
 
         private void doWaitTransfer() {
+            synchronized (this.requestsRead) {
                 if (!this.requestsRead.isEmpty()) {
                     for (CommitLog.GroupCommitRequest req : this.requestsRead) {
                         boolean transferOK = HAService.this.push2SlaveMaxOffset.get() >= req.getNextOffset();
@@ -291,6 +292,7 @@ public class HAService {
                     this.requestsRead.clear();
                 }
             }
+        }
 
         public void run() {
             log.info(this.getServiceName() + " service started");