This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 9fd24011 refactor: update space cache (#491)
9fd24011 is described below
commit 9fd240119d1fa2b7a4f4e932c969d1022a8c833d
Author: wtt <[email protected]>
AuthorDate: Sat Oct 12 15:52:28 2024 +0800
refactor: update space cache (#491)
---
.../manager/service/impl/LogSpaceServiceImpl.java | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogSpaceServiceImpl.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogSpaceServiceImpl.java
index a2dfddfc..8d9940ec 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogSpaceServiceImpl.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogSpaceServiceImpl.java
@@ -20,6 +20,14 @@ import com.alibaba.nacos.common.utils.CollectionUtils;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Lists;
+import com.xiaomi.mone.tpc.common.enums.NodeUserRelTypeEnum;
+import com.xiaomi.mone.tpc.common.enums.UserTypeEnum;
+import com.xiaomi.mone.tpc.common.vo.NodeVo;
+import com.xiaomi.mone.tpc.common.vo.PageDataVo;
+import com.xiaomi.youpin.docean.anno.Service;
+import com.xiaomi.youpin.docean.common.StringUtils;
+import com.xiaomi.youpin.docean.plugin.db.Transactional;
+import lombok.extern.slf4j.Slf4j;
import org.apache.ozhera.log.api.enums.LogStructureEnum;
import org.apache.ozhera.log.api.enums.MachineRegionEnum;
import org.apache.ozhera.log.api.enums.OperateEnum;
@@ -41,14 +49,6 @@ import org.apache.ozhera.log.manager.model.pojo.MilogSpaceDO;
import org.apache.ozhera.log.manager.service.BaseService;
import org.apache.ozhera.log.manager.service.LogSpaceService;
import org.apache.ozhera.log.manager.user.MoneUser;
-import com.xiaomi.mone.tpc.common.enums.NodeUserRelTypeEnum;
-import com.xiaomi.mone.tpc.common.enums.UserTypeEnum;
-import com.xiaomi.mone.tpc.common.vo.NodeVo;
-import com.xiaomi.mone.tpc.common.vo.PageDataVo;
-import com.xiaomi.youpin.docean.anno.Service;
-import com.xiaomi.youpin.docean.common.StringUtils;
-import com.xiaomi.youpin.docean.plugin.db.Transactional;
-import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -117,6 +117,8 @@ public class LogSpaceServiceImpl extends BaseService
implements LogSpaceService
com.xiaomi.youpin.infra.rpc.Result tpcResult =
spaceAuthService.saveSpacePerm(dbDO, creator);
addMemberAsync(dbDO.getId(), otherAdmins);
+ SPACE_ALL_CACHE.invalidate(buildCacheKey(param.getTenantId()));
+
if (tpcResult == null || tpcResult.getCode() != 0) {
milogSpaceDao.deleteMilogSpace(dbDO.getId());
log.error("The new space is not associated with a permission
system,space:[{}], tpcResult:[{}]", dbDO, tpcResult);
@@ -275,6 +277,8 @@ public class LogSpaceServiceImpl extends BaseService
implements LogSpaceService
if (milogSpaceDao.update(milogSpace)) {
com.xiaomi.youpin.infra.rpc.Result tpcResult =
spaceAuthService.updateSpaceTpc(param,
MoneUserContext.getCurrentUser().getUser());
+
+ SPACE_ALL_CACHE.invalidate(buildCacheKey(param.getTenantId()));
if (tpcResult == null || tpcResult.getCode() != 0) {
log.error("Modify the space permission system not associated
with it,space:[{}], tpcResult:[{}]", milogSpace, tpcResult);
return Result.success("To modify the unassociated permission
system of space, contact the server-side performance group");
@@ -306,6 +310,7 @@ public class LogSpaceServiceImpl extends BaseService
implements LogSpaceService
if (milogSpaceDao.deleteMilogSpace(id)) {
logTailService.deleteConfigRemote(id, id,
MachineRegionEnum.CN_MACHINE.getEn(), LogStructureEnum.SPACE);
+
SPACE_ALL_CACHE.invalidate(buildCacheKey(milogSpace.getTenantId()));
com.xiaomi.youpin.infra.rpc.Result tpcResult =
spaceAuthService.deleteSpaceTpc(id, MoneUserContext.getCurrentUser().getUser(),
MoneUserContext.getCurrentUser().getUserType());
if (tpcResult == null || tpcResult.getCode() != 0) {
log.error("Remove the space without associated permission
system,space:[{}], tpcResult:[{}]", milogSpace, tpcResult);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]