[kylin] 14/25: Fix secondstorage index refresh locked

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 2ee515cee3130273bb3463f026fcab1ff6b1835b
Author: Shuai li <loney...@live.cn>
AuthorDate: Thu Oct 13 11:13:18 2022 +0800

    Fix secondstorage index refresh locked
---
 .../kap/secondstorage/SecondStorageIndexTest.java          |  2 +-
 .../kap/secondstorage/management/SecondStorageService.java | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git 
a/src/second-storage/clickhouse-it/src/test/java/io/kyligence/kap/secondstorage/SecondStorageIndexTest.java
 
b/src/second-storage/clickhouse-it/src/test/java/io/kyligence/kap/secondstorage/SecondStorageIndexTest.java
index 5f561c7183..ef86a1062a 100644
--- 
a/src/second-storage/clickhouse-it/src/test/java/io/kyligence/kap/secondstorage/SecondStorageIndexTest.java
+++ 
b/src/second-storage/clickhouse-it/src/test/java/io/kyligence/kap/secondstorage/SecondStorageIndexTest.java
@@ -349,7 +349,7 @@ public class SecondStorageIndexTest implements JobWaiter {
         String jobId = updatePrimaryIndexAndSecondaryIndex(modelName, null, 
Sets.newHashSet());
         waitJobEnd(getProject(), jobId);
 
-        assertThrows(String.format(Locale.ROOT, 
MsgPicker.getMsg().getSecondStorageProjectJobExists(), getProject()),
+        assertThrows(String.format(Locale.ROOT, 
MsgPicker.getMsg().getSecondStorageConcurrentOperate(), getProject()),
                 KylinException.class, () -> 
updatePrimaryIndexAndSecondaryIndex(modelName, null, secondaryIndex));
         clickhouse[0].start();
         ClickHouseUtils.internalConfigClickHouse(clickhouse, replica);
diff --git 
a/src/second-storage/core-ui/src/main/java/io/kyligence/kap/secondstorage/management/SecondStorageService.java
 
b/src/second-storage/core-ui/src/main/java/io/kyligence/kap/secondstorage/management/SecondStorageService.java
index d10474b43e..ade320fa8d 100644
--- 
a/src/second-storage/core-ui/src/main/java/io/kyligence/kap/secondstorage/management/SecondStorageService.java
+++ 
b/src/second-storage/core-ui/src/main/java/io/kyligence/kap/secondstorage/management/SecondStorageService.java
@@ -1157,25 +1157,15 @@ public class SecondStorageService extends BasicService 
implements SecondStorageU
     private void checkUpdateIndex(String project, String modelId) {
         SecondStorageUtil.validateProjectLock(project, 
Collections.singletonList(LockTypeEnum.LOAD.name()));
         List<AbstractExecutable> jobs = getRelationJobsWithoutFinish(project, 
modelId);
-        if (!jobs.isEmpty()) {
-            throw new 
KylinException(JobErrorCode.SECOND_STORAGE_PROJECT_JOB_EXISTS,
-                    String.format(Locale.ROOT, 
MsgPicker.getMsg().getSecondStorageProjectJobExists(), project));
-        }
-        jobs = getJobs(project, modelId, 
Sets.newHashSet(ExecutableState.ERROR),
-                
Sets.newHashSet(JobTypeEnum.SECOND_STORAGE_REFRESH_SECONDARY_INDEXES));
         if (!jobs.isEmpty()) {
             throw new KylinException(JobErrorCode.SECOND_STORAGE_JOB_EXISTS,
-                    MsgPicker.getMsg().getSecondStorageConcurrentOperate());
+                    String.format(Locale.ROOT, 
MsgPicker.getMsg().getSecondStorageConcurrentOperate(), project));
         }
         jobs = getJobs(project, modelId, 
Sets.newHashSet(ExecutableState.ERROR),
                 
Sets.newHashSet(JobTypeEnum.SECOND_STORAGE_REFRESH_SECONDARY_INDEXES));
         if (!jobs.isEmpty()) {
             throw new KylinException(JobErrorCode.SECOND_STORAGE_JOB_EXISTS,
-                    MsgPicker.getMsg().getSecondStorageConcurrentOperate());
-        }
-        if (SecondStorageLockUtils.containsKey(modelId)) {
-            throw new KylinException(JobErrorCode.SECOND_STORAGE_JOB_EXISTS,
-                    MsgPicker.getMsg().getSecondStorageConcurrentOperate());
+                    String.format(Locale.ROOT, 
MsgPicker.getMsg().getSecondStorageConcurrentOperate(), project));
         }
     }