Lehel44 commented on code in PR #7588: URL: https://github.com/apache/nifi/pull/7588#discussion_r1295816985
########## nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HDFSResourceHelper.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.hadoop; + +import java.io.IOException; +import java.lang.reflect.Field; +import org.apache.hadoop.fs.FileSystem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class HDFSResourceHelper { + private final static Logger LOGGER = LoggerFactory.getLogger(HDFSResourceHelper.class); Review Comment: Please reorder the modifiers to comply with JSL. ########## nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/HDFSResourceHelper.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.hadoop; + +import java.io.IOException; +import java.lang.reflect.Field; +import org.apache.hadoop.fs.FileSystem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class HDFSResourceHelper { + private final static Logger LOGGER = LoggerFactory.getLogger(HDFSResourceHelper.class); + + private HDFSResourceHelper() { + // Not to be instantiated + } + + public static void closeFileSystem(final FileSystem fileSystem) { + try { + interruptStatisticsThread(fileSystem); + } catch (Exception e) { + LOGGER.warn("Error stopping FileSystem statistics thread: " + e.getMessage()); Review Comment: I think this is an error level message, we can use logger method to pass exception objects ########## nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/flow/resource/hadoop/HDFSExternalResourceProvider.java: ########## @@ -140,13 +146,16 @@ public InputStream fetchExternalResource(final ExternalResourceDescriptor descri final HdfsResources hdfsResources = getHdfsResources(); try { - return hdfsResources.getUserGroupInformation().doAs((PrivilegedExceptionAction<FSDataInputStream>) () -> { - if (!hdfsResources.getFileSystem().exists(path)) { - throw new IOException("Cannot find file in HDFS at location " + location); - } - - return hdfsResources.getFileSystem().open(path, BUFFER_SIZE_DEFAULT); - }); + final FSDataInputStream fsDataInputStream = + hdfsResources.getUserGroupInformation().doAs((PrivilegedExceptionAction<FSDataInputStream>) () -> { + if (!hdfsResources.getFileSystem().exists(path)) { + throw new IOException("Cannot find file in HDFS at location " + location); + } + + return hdfsResources.getFileSystem().open(path, BUFFER_SIZE_DEFAULT); + }); + // The acquired InputStream is used by the client and cannot be closed here. The decorator is responsible for that. Review Comment: This part of the code is difficult to understand especially if someone is not familiar with decorator patterns. I'd mention two things here. - The FileSystem cannot be closed upon reading from the InputStream so they're bundled in together in the HDFSResourceInputStream. - The HDFSResourceInputStream::close also closes the FileSystem -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
