From 28788aba9514e3fba0fe7a7b134dd187536b9b9d Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Fri, 29 Jan 2021 15:45:20 +0100 Subject: [PATCH] hdfs user --- .../manager/controller/MDStoreController.java | 1 + .../data/mdstore/manager/utils/HdfsClient.java | 15 ++++++++++++++- .../src/main/resources/application.properties | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java index cee8d2c8..0d46e9aa 100644 --- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java +++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java @@ -164,6 +164,7 @@ public class MDStoreController extends AbstractDnetController { public Map info() { final Map info = new LinkedHashMap<>(); info.put("number_of_mdstores", databaseUtils.countMdStores()); + info.put("hadoop_user", hdfsClient.getHadoopUser()); info.put("hadoop_cluster", hdfsClient.getHadoopCluster()); info.put("hdfs_base_path", databaseUtils.getHdfsBasePath()); info.put("expired_versions", databaseUtils.listExpiredVersions()); diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/HdfsClient.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/HdfsClient.java index a39c1406..e536c6d9 100644 --- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/HdfsClient.java +++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/HdfsClient.java @@ -18,11 +18,16 @@ public class HdfsClient { @Value("${dhp.mdstore-manager.hadoop.cluster}") private String hadoopCluster; + @Value("${dhp.mdstore-manager.hadoop.user}") + private String hadoopUser; + private static final Log log = LogFactory.getLog(HdfsClient.class); public void deletePath(final String path) throws MDStoreManagerException { final Configuration conf = new Configuration(); + System.setProperty("HADOOP_USER_NAME", hadoopUser); + if (hadoopCluster.equalsIgnoreCase("OCEAN")) { conf.addResource(getClass().getResourceAsStream("/hadoop/OCEAN/core-site.xml")); conf.addResource(getClass().getResourceAsStream("/hadoop/OCEAN/ocean-hadoop-conf.xml")); @@ -36,7 +41,7 @@ public class HdfsClient { try (final FileSystem fs = FileSystem.get(conf)) { fs.delete(new Path(path), true); - log.info("HDFS Pathe deleted: " + path); + log.info("HDFS Path deleted: " + path); } catch (IllegalArgumentException | IOException e) { log.error("Eror deleting path: " + path, e); throw new MDStoreManagerException("Eror deleting path: " + path, e); @@ -50,4 +55,12 @@ public class HdfsClient { public void setHadoopCluster(final String hadoopCluster) { this.hadoopCluster = hadoopCluster; } + + public String getHadoopUser() { + return hadoopUser; + } + + public void setHadoopUser(final String hadoopUser) { + this.hadoopUser = hadoopUser; + } } diff --git a/apps/dhp-mdstore-manager/src/main/resources/application.properties b/apps/dhp-mdstore-manager/src/main/resources/application.properties index 7aae3656..985555ba 100644 --- a/apps/dhp-mdstore-manager/src/main/resources/application.properties +++ b/apps/dhp-mdstore-manager/src/main/resources/application.properties @@ -24,3 +24,4 @@ logging.level.io.swagger.models.parameters.AbstractSerializableParameter = error # Hadoop dhp.mdstore-manager.hadoop.cluster = GARR dhp.mdstore-manager.hdfs.base-path = /tmp/mdstoremanager_dev +dhp.mdstore-manager.hadoop.user = dnet.dev