解决user setting并发问题,fix #566

This commit is contained in:
heavyrian2012
2022-11-15 17:12:51 +08:00
parent 90504d1305
commit 3ccfd9a29b
@@ -49,6 +49,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -121,6 +122,8 @@ public class MemoryMessagesStore implements IMessagesStore {
private Lock mReadLock = mLock.readLock(); private Lock mReadLock = mLock.readLock();
private Lock mWriteLock = mLock.writeLock(); private Lock mWriteLock = mLock.writeLock();
private Lock mUserSettingLock = new ReentrantLock();
private final DatabaseStore databaseStore; private final DatabaseStore databaseStore;
private ConcurrentHashMap<String, Long> userMaxPullSeq = new ConcurrentHashMap<>(); private ConcurrentHashMap<String, Long> userMaxPullSeq = new ConcurrentHashMap<>();
@@ -1422,12 +1425,16 @@ public class MemoryMessagesStore implements IMessagesStore {
void removeFavGroup(String groupId, List<String> memberIds) { void removeFavGroup(String groupId, List<String> memberIds) {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
databaseStore.removeFavGroup(groupId, memberIds); databaseStore.removeFavGroup(groupId, memberIds);
try {
for (String member : memberIds) { mUserSettingLock.lock();
userSettingMap.remove(member); MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
for (String member : memberIds) {
userSettingMap.remove(member);
}
} finally {
mUserSettingLock.unlock();
} }
} }
@@ -1507,13 +1514,17 @@ public class MemoryMessagesStore implements IMessagesStore {
private void removeGroupUserSettings(String groupId, List<String> users) { private void removeGroupUserSettings(String groupId, List<String> users) {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
databaseStore.removeGroupUserSettings(groupId, users); databaseStore.removeGroupUserSettings(groupId, users);
for (String userId:users) { try {
userSettingMap.remove(userId); mUserSettingLock.lock();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
for (String userId:users) {
userSettingMap.remove(userId);
}
} finally {
mUserSettingLock.unlock();
} }
} }
@Override @Override
@@ -3587,9 +3598,15 @@ public class MemoryMessagesStore implements IMessagesStore {
IMap<String, WFCMessage.GroupInfo> mGroups = hzInstance.getMap(GROUPS_MAP); IMap<String, WFCMessage.GroupInfo> mGroups = hzInstance.getMap(GROUPS_MAP);
IMap<String, WFCMessage.ChannelInfo> mChannels = hzInstance.getMap(CHANNELS); IMap<String, WFCMessage.ChannelInfo> mChannels = hzInstance.getMap(CHANNELS);
Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId); Collection<WFCMessage.UserSettingEntry> entries;
if (entries == null || entries.size() == 0) { try {
entries = loadPersistedUserSettings(userId, userSettingMap); mUserSettingLock.lock();
entries = userSettingMap.get(userId);
if (entries == null || entries.size() == 0) {
entries = loadPersistedUserSettings(userId, userSettingMap);
}
} finally {
mUserSettingLock.unlock();
} }
ErrorCode ec = ErrorCode.ERROR_CODE_NOT_MODIFIED; ErrorCode ec = ErrorCode.ERROR_CODE_NOT_MODIFIED;
@@ -3668,17 +3685,22 @@ public class MemoryMessagesStore implements IMessagesStore {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING); MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId); try {
if (entries == null || entries.size() == 0) { mUserSettingLock.lock();
entries = loadPersistedUserSettings(userId, userSettingMap); Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId);
} if (entries == null || entries.size() == 0) {
entries = loadPersistedUserSettings(userId, userSettingMap);
}
if (entries != null) { if (entries != null) {
for (WFCMessage.UserSettingEntry entry : entries) { for (WFCMessage.UserSettingEntry entry : entries) {
if (entry.getScope() == scope && (key== null || key.equals(entry.getKey()))) { if (entry.getScope() == scope && (key== null || key.equals(entry.getKey()))) {
return entry; return entry;
}
} }
} }
} finally {
mUserSettingLock.unlock();
} }
return null; return null;
@@ -3689,19 +3711,25 @@ public class MemoryMessagesStore implements IMessagesStore {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING); MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId); List<WFCMessage.UserSettingEntry> result;
if (entries == null || entries.size() == 0) { try {
entries = loadPersistedUserSettings(userId, userSettingMap); mUserSettingLock.lock();
} Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId);
if (entries == null || entries.size() == 0) {
entries = loadPersistedUserSettings(userId, userSettingMap);
}
List<WFCMessage.UserSettingEntry> result = new ArrayList<>(); result = new ArrayList<>();
if (entries != null) { if (entries != null) {
for (WFCMessage.UserSettingEntry entry : entries for (WFCMessage.UserSettingEntry entry : entries
) { ) {
if (entry.getScope() == scope) { if (entry.getScope() == scope) {
result.add(entry); result.add(entry);
}
} }
} }
} finally {
mUserSettingLock.unlock();
} }
return result; return result;
@@ -3712,28 +3740,34 @@ public class MemoryMessagesStore implements IMessagesStore {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING); MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId); long updateDt = 0;
if (entries == null || entries.size() == 0) { try {
entries = loadPersistedUserSettings(userId, userSettingMap); mUserSettingLock.lock();
if (entries == null) { Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId);
entries = new ArrayList<>(); if (entries == null || entries.size() == 0) {
entries = loadPersistedUserSettings(userId, userSettingMap);
if (entries == null) {
entries = new ArrayList<>();
}
} }
}
long updateDt = System.currentTimeMillis(); updateDt = System.currentTimeMillis();
WFCMessage.UserSettingEntry settingEntry = WFCMessage.UserSettingEntry.newBuilder().setScope(request.getScope()).setKey(request.getKey()).setValue(request.getValue()).setUpdateDt(updateDt).build(); WFCMessage.UserSettingEntry settingEntry = WFCMessage.UserSettingEntry.newBuilder().setScope(request.getScope()).setKey(request.getKey()).setValue(request.getValue()).setUpdateDt(updateDt).build();
databaseStore.persistUserSetting(userId, settingEntry); databaseStore.persistUserSetting(userId, settingEntry);
for (WFCMessage.UserSettingEntry entry : entries for (WFCMessage.UserSettingEntry entry : entries
) { ) {
if (entry.getScope() == request.getScope() && entry.getKey().equals(request.getKey())) { if (entry.getScope() == request.getScope() && entry.getKey().equals(request.getKey())) {
userSettingMap.remove(userId, entry); userSettingMap.remove(userId, entry);
userSettingMap.put(userId, settingEntry); userSettingMap.put(userId, settingEntry);
break; break;
}
} }
}
userSettingMap.put(userId, settingEntry); userSettingMap.put(userId, settingEntry);
} finally {
mUserSettingLock.unlock();
}
if(request.getScope() == UserSettingScope.kUserSettingConversationSilent) { if(request.getScope() == UserSettingScope.kUserSettingConversationSilent) {
int firstSplit = request.getKey().indexOf("-"); int firstSplit = request.getKey().indexOf("-");
@@ -3758,8 +3792,14 @@ public class MemoryMessagesStore implements IMessagesStore {
public void clearUserSettings(String userId) { public void clearUserSettings(String userId) {
databaseStore.clearUserSetting(userId); databaseStore.clearUserSetting(userId);
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
userSettingMap.remove(userId); try {
mUserSettingLock.lock();
MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
userSettingMap.remove(userId);
} finally {
mUserSettingLock.unlock();
}
} }
@Override @Override