Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.6 cad64cec3 -> d4cbf4f68
RANGER-1156:Audit migration script from DB to Solr cloud failing Signed-off-by: Selvamohan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d4cbf4f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d4cbf4f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d4cbf4f6 Branch: refs/heads/ranger-0.6 Commit: d4cbf4f68767863c9ef5237e30d091f981baf4b9 Parents: cad64ce Author: pradeep agrawal <[email protected]> Authored: Fri Aug 19 19:04:22 2016 +0530 Committer: Selvamohan Neethiraj <[email protected]> Committed: Sat Aug 20 04:47:20 2016 -0400 ---------------------------------------------------------------------- .../ranger/patch/cliutil/DbToSolrMigrationUtil.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4cbf4f6/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java index 283f44f..f25c3f7 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java @@ -236,6 +236,15 @@ public class DbToSolrMigrationUtil extends BaseLoader { System.out.println("Total Number of Migrated Audit logs:"+totalMigratedLogs); logger.info("Total Number of Migrated Audit logs:"+totalMigratedLogs); } + if(solrClient!=null){ + try { + solrClient.close(); + } catch (IOException e) { + logger.error("Error while closing solr connection", e); + }finally{ + solrClient=null; + } + } System.out.println("Migration process finished!!"); } @@ -401,8 +410,7 @@ public class DbToSolrMigrationUtil extends BaseLoader { zkHosts); solrCloudClient .setDefaultCollection(collectionName); - solrClient = solrCloudClient; - solrCloudClient.close(); + return solrCloudClient; } catch (Exception e) { logger.fatal( "Can't connect to Solr server. ZooKeepers="
