KYLO-3224 fix profiler cache. Fix IT tests

askmetoo · Dec 14, 2018 · 31fff73 · 31fff73
1 parent b112695
commit 31fff73
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...ices/service-app/src/test/java/com/thinkbiganalytics/integration/IntegrationTestBase.java b/...ices/service-app/src/test/java/com/thinkbiganalytics/integration/IntegrationTestBase.java
@@ -599,7 +599,7 @@ protected String getProcessingDttm(String feedId) {
     }
 
     protected int getProfileSummary(String feedId, String profileType) {
-        return Integer.parseInt(getJsonPathOfProfileSummary(feedId, "find {entry ->entry.metrictype == '" + profileType + "'}.metricvalue"));
+        return Integer.parseInt(getJsonPathOfProfileSummary(feedId, "content.find {entry ->entry.metrictype == '" + profileType + "'}.metricvalue"));
     }
 
     protected String getJsonPathOfProfileSummary(String feedId, String path) {
@@ -619,7 +619,7 @@ protected String getProfileStatsForColumn(String feedId, String processingDttm,
 
         response.then().statusCode(HTTP_OK);
 
-        String path = String.format("find {entry ->entry.metrictype == '%s' && entry.columnname == '%s'}.metricvalue", profileType, column);
+        String path = String.format("content.find {entry ->entry.metrictype == '%s' && entry.columnname == '%s'}.metricvalue", profileType, column);
         return JsonPath.from(response.asString()).getString(path);
     }
 

diff --git a/...rvice/thrift-proxy-core/src/main/java/com/thinkbiganalytics/hive/service/HiveService.java b/...rvice/thrift-proxy-core/src/main/java/com/thinkbiganalytics/hive/service/HiveService.java
@@ -256,20 +256,30 @@ public int update(@Nonnull final String query) {
 
 
     public boolean isTableAccessibleByImpersonatedUser(String table) {
+       return isTableAccessibleByImpersonatedUser(table,true);
+    }
+
+    private boolean isTableAccessibleByImpersonatedUser(String table, boolean refreshCache) {
         String currentUser = SecurityContextHolder.getContext().getAuthentication().getName();
         String schemaName = table.substring(0, table.indexOf("."));
         try {
             UserHiveAccessCache cache = this.perUserAccessCache.get(currentUser);
             List<String> tables = cache.getTables(schemaName);
-            return tables != null && tables.contains(table);
+            boolean hasAccess = tables != null && tables.contains(table);
+            if(!hasAccess && refreshCache && cache.getSchemas().contains(schemaName)){
+                //attempt to refresh it
+                refreshHiveAccessCacheForImpersonatedUser();
+                hasAccess = isTableAccessibleByImpersonatedUser(table,false);
+            }
+            return hasAccess;
         } catch (ExecutionException e) {
             throw new RuntimeException(String.format("Failed to determine if Hive table %s is accessible by user %s", table, currentUser));
         }
     }
 
     public void refreshHiveAccessCacheForImpersonatedUser() {
         String currentUser = SecurityContextHolder.getContext().getAuthentication().getName();
-        this.perUserAccessCache.refresh(currentUser);
+        this.perUserAccessCache.invalidate(currentUser);
     }
 
     public QueryResult getTablePartitions(String tableName) {