KYLIN-4485 Minor fix

apache · Jun 10, 2020 · aa42d8c · aa42d8c
1 parent d0d4ff3
commit aa42d8c
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 35 deletions.
diff --git a/core-common/src/main/java/org/apache/kylin/common/KConstants.java b/core-common/src/main/java/org/apache/kylin/common/KConstants.java
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -201,6 +201,15 @@ final protected String[] getOptionalStringArray(String prop, String[] dft) {
         }
     }
 
+    final protected String[] getRawStringArray(String prop, String[] dft) {
+        final String property = properties.getProperty(prop);
+        if (!StringUtils.isBlank(property)) {
+            return property.split("\\s*,\\s*");
+        } else {
+            return dft;
+        }
+    }
+
     final protected int[] getOptionalIntArray(String prop, String[] dft) {
         String[] strArray = getOptionalStringArray(prop, dft);
         int[] intArray = new int[strArray.length];
@@ -618,7 +627,7 @@ public String getCuboidScheduler() {
     }
 
     public boolean isRowKeyEncodingAutoConvert() {
-        return Boolean.parseBoolean(getOptional("kylin.cube.kylin.cube.rowkey-encoding-auto-convert", "true"));
+        return Boolean.parseBoolean(getOptional("kylin.cube.rowkey-encoding-auto-convert", "true"));
     }
 
     public String getSegmentAdvisor() {
@@ -2038,6 +2047,10 @@ public String[] getRestServers() {
         return getOptionalStringArray("kylin.server.cluster-servers", new String[0]);
     }
 
+    public String[] getRawRestServers() {
+        return getRawStringArray("kylin.server.cluster-servers", new String[0]);
+    }
+
     public String getServerRestAddress() {
         return getOptional("kylin.server.host-address", "localhost:7070");
     }
@@ -2141,6 +2154,7 @@ public boolean isWebDashboardEnabled() {
 
     public String getPropertiesWhiteList() {
         return getOptional("kylin.web.properties.whitelist", "kylin.web.timezone,kylin.query.cache-enabled,kylin.env,"
+                + "kylin.cube.migration.enabled,"
                 + "kylin.web.hive-limit,kylin.storage.default,"
                 + "kylin.engine.default,kylin.web.link-hadoop,kylin.web.link-diagnostic,"
                 + "kylin.web.contact-mail,kylin.web.help.length,kylin.web.help.0,kylin.web.help.1,kylin.web.help.2,"
@@ -2258,6 +2272,10 @@ public int printSampleEventRatio(){
     // ============================================================================
     // CUBE MIGRATION
     // ============================================================================
+    public boolean isMigrationCubeEnabled() {
+        return Boolean.parseBoolean(getOptional("kylin.cube.migration.enabled", FALSE));
+    }
+
     public int getMigrationRuleExpansionRateThreshold() {
         return Integer.parseInt(getOptional("kylin.cube.migration.expansion-rate", "5"));
     }
@@ -2286,12 +2304,12 @@ public String getMigrationTargetAddress() {
         return getOptional("kylin.cube.migration.target-address", "sandbox:80");
     }
 
-    public String getMigrationEmailSuffix() {
-        return getOptional("kylin.cube.migration.mail-suffix", "@mail.com");
+    public String getNotificationMailSuffix() {
+        return getOptional("kylin.cube.notification-mail-suffix", "@mail.com");
     }
 
     public boolean isMigrationApplyQueryLatencyRule() {
-        return Boolean.parseBoolean(getOptional("kylin.cube.migration.rule-query-latency-enabled", "true"));
+        return Boolean.parseBoolean(getOptional("kylin.cube.migration.rule-query-latency-enabled", TRUE));
     }
 
     // ============================================================================

diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
@@ -327,7 +327,7 @@ public void onEntityChange(Broadcaster broadcaster, String entity, Event event,
 
     public void reloadTableExtQuietly(String table, String project) {
         try (AutoLock lock = srcExtMapLock.lockForWrite()) {
-            srcExtCrud.reloadQuietly(TableExtDesc.concatResourcePath(table, project));
+            srcExtCrud.reloadQuietly(TableDesc.makeResourceName(table, project));
         }
     }
 

diff --git a/cube-migration/src/main/java/org/apache/kylin/rest/service/MigrationService.java b/cube-migration/src/main/java/org/apache/kylin/rest/service/MigrationService.java
@@ -169,7 +169,7 @@ public List<String> getCubeAdmins(CubeInstance cubeInstance) {
         logger.info("ProjectUUID : " + prjInstance.getUuid());
         Acl acl = accessService.getAcl(ae);
 
-        String mailSuffix = KylinConfig.getInstanceFromEnv().getMigrationEmailSuffix();
+        String mailSuffix = KylinConfig.getInstanceFromEnv().getNotificationMailSuffix();
         List<String> cubeAdmins = Lists.newArrayList();
         if (acl != null) {
             for (AccessControlEntry ace : acl.getEntries()) {

diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
@@ -141,7 +141,7 @@ public void checkHiveTableCompatibility(String prj, TableDesc tableDesc) throws
             hiveTableDesc = pair.getFirst();
         } catch (Exception e) {
             logger.error("Fail to get metadata for hive table {} due to ", tableDesc.getIdentity(), e);
-            throw new RuntimeException("Fail to get metadata for hive table" + tableDesc.getIdentity());
+            throw new RuntimeException("Fail to get metadata for hive table " + tableDesc.getIdentity());
         }
 
         TableSchemaUpdateChecker.CheckResult result = getSchemaUpdateChecker().allowMigrate(tableDesc, hiveTableDesc);

diff --git a/tool/src/main/java/org/apache/kylin/tool/CubeMigrationCLI.java b/tool/src/main/java/org/apache/kylin/tool/CubeMigrationCLI.java
@@ -645,10 +645,10 @@ private String renameTableWithinProject(String srcItem) {
     }
 
     private void updateMeta(KylinConfig config, String projectName, String cubeName, DataModelDesc model) {
-        String[] nodes = config.getRestServers();
+        String[] nodes = config.getRawRestServers();
         Map<String, String> tableToProjects = new HashMap<>();
         for (TableRef tableRef : model.getAllTables()) {
-            tableToProjects.put(tableRef.getTableIdentity(), tableRef.getTableDesc().getProject());
+            tableToProjects.put(tableRef.getTableIdentity(), projectName);
         }
 
         for (String node : nodes) {

diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js
@@ -66,6 +66,14 @@ KylinApp.service('kylinConfig', function (AdminService, $log) {
     return false;
   }
 
+  this.isCubeMigrationEnabled = function(){
+    var status = this.getProperty("kylin.cube.migration.enabled").trim();
+    if(status!=='false'){
+      return true;
+    }
+    return false;
+  }
+
   //deprecated
   this.getDeployEnv = function () {
     this.deployEnv = this.getProperty("kylin.env");

diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
@@ -102,7 +102,7 @@
                         <li ng-if="cube.status=='DISABLED' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="startDeleteSegment(cube)">Delete Segment</a></li>
                         <li ng-if="cube.status=='DISABLED' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="purge(cube)">Purge</a></li>
                         <li ng-if="cube.status!='DESCBROKEN' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="cloneCube(cube)">Clone</a></li>
-                        <li ng-if="cube.status=='READY' && (userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask) || hasPermission(cubeProjectEntity, permissions.ADMINISTRATION.mask))"><a ng-click="startMigrateCube(cube, 0);">Migrate</a></li>
+                        <li ng-if="cube.status=='READY' && kylinConfig.isCubeMigrationEnabled() && (userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask) || hasPermission(cubeProjectEntity, permissions.ADMINISTRATION.mask))"><a ng-click="startMigrateCube(cube, 0);">Migrate</a></li>
 
                     </ul>
                     <ul ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission('cube', cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)) && cube.streamingV2 && actionLoaded" class="dropdown-menu" role="menu" style="right:0;left:auto;">
@@ -132,8 +132,8 @@
                     <ul class="dropdown-menu" role="menu" style="right:0;left:auto;">
                         <li ng-if="cube.status!='READY'"><a href="cubes/edit/{{cube.name}}/descriptionjson">Edit CubeDesc</a></li>
                         <li><a href="cubes/view/{{cube.name}}/instancejson">View Cube</a></li>
-                        <li ng-if="cube.status=='READY' && kylinConfig.getDeployEnv().indexOf('QA') > -1"><a ng-click="startMigrateCube(cube, 1)">Approve Migration</a></li>
-                        <li ng-if="cube.status=='READY' && kylinConfig.getDeployEnv().indexOf('QA') > -1"><a ng-click="startMigrateCube(cube, -1)">Reject Migration</a></li>
+                        <li ng-if="cube.status=='READY' && kylinConfig.isCubeMigrationEnabled()"><a ng-click="startMigrateCube(cube, 1)">Approve Migration</a></li>
+                        <li ng-if="cube.status=='READY' && kylinConfig.isCubeMigrationEnabled()"><a ng-click="startMigrateCube(cube, -1)">Reject Migration</a></li>
                     </ul>
                 </div>
             </td>