[BugFix] Avoid hdfs fs manager interrupting the thread when exception…

… occurs (#48403) Signed-off-by: xiangguangyxg <[email protected]> (cherry picked from commit 3fcafac) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java
StarRocks · Jul 22, 2024 · fbd89c2 · fbd89c2
1 parent 5f9a143
commit fbd89c2
Showing 1 changed file with 77 additions and 0 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java b/fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java
@@ -46,6 +46,7 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -1180,6 +1181,29 @@ public void getTProperties(String path, Map<String, String> loadProperties, THdf
  getFileSystem(path, loadProperties, tProperties);
  }
 
+<<<<<<< HEAD
+=======
+ public List<FileStatus> listFileMeta(String path, Map<String, String> properties) throws UserException {
+ WildcardURI pathUri = new WildcardURI(path);
+ HdfsFs fileSystem = getFileSystem(path, properties, null);
+ Path pathPattern = new Path(pathUri.getPath());
+ try {
+ FileStatus[] files = fileSystem.getDFSFileSystem().globStatus(pathPattern);
+ return Lists.newArrayList(files);
+ } catch (FileNotFoundException e) {
+ LOG.info("file not found: " + path, e);
+ throw new UserException("file not found: " + path, e);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while get file status: " + path, e);
+ throw new UserException("Failed to get file status: " + path, e); // throw unified user exception
+ } catch (Exception e) {
+ LOG.error("errors while get file status ", e);
+ throw new UserException("Fail to get file status: " + e.getMessage(), e);
+ }
+ }
+
+>>>>>>> 3fcafac8b9 ([BugFix] Avoid hdfs fs manager interrupting the thread when exception occurs (#48403))
  public List<TBrokerFileStatus> listPath(String path, boolean fileNameOnly, Map<String, String> loadProperties)
  throws UserException {
  List<TBrokerFileStatus> resultFileStatus = null;
@@ -1220,6 +1244,10 @@ public List<TBrokerFileStatus> listPath(String path, boolean fileNameOnly, Map<S
  "the arguments like region, IAM, instance profile and so on.");
  throw new UserException("The arguments of blob store(S3/Azure) may be wrong. " +
  "You can check the arguments like region, IAM, instance profile and so on.", e);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while list path: " + path, e);
+ throw new UserException("Failed to list path: " + path, e); // throw unified user exception
  } catch (Exception e) {
  LOG.error("errors while get file status ", e);
  throw new UserException("Fail to get file status: " + e.getMessage(), e);
@@ -1233,6 +1261,10 @@ public void deletePath(String path, Map<String, String> loadProperties) throws U
  Path filePath = new Path(pathUri.getPath());
  try {
  fileSystem.getDFSFileSystem().delete(filePath, true);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while delete path: " + path, e);
+ throw new UserException("Failed to delete path: " + path, e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while delete path " + path, e);
  throw new UserException("delete path " + path + "error", e);
@@ -1262,6 +1294,11 @@ public void renamePath(String srcPath, String destPath, Map<String, String> load
  if (!isRenameSuccess) {
  throw new UserException("failed to rename path from " + srcPath + " to " + destPath);
  }
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while rename path from " + srcPath + " to " + destPath, e);
+ // throw unified user exception
+ throw new UserException("Failed to rename path from " + srcPath + " to " + destPath, e);
  } catch (IOException e) {
  LOG.error("errors while rename path from " + srcPath + " to " + destPath, e);
  throw new UserException("errors while rename " + srcPath + "to " + destPath, e);
@@ -1274,6 +1311,10 @@ public boolean checkPathExist(String path, Map<String, String> loadProperties) t
  Path filePath = new Path(pathUri.getPath());
  try {
  return fileSystem.getDFSFileSystem().exists(filePath);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while check path exist: " + path, e);
+ throw new UserException("Failed to check path exist: " + path, e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while check path exist: " + path, e);
  throw new UserException("errors while check if path " + path + " exist", e);
@@ -1291,6 +1332,10 @@ public TBrokerFD openReader(String path, long startOffset, Map<String, String> l
  TBrokerFD fd = parseUUIDToFD(uuid);
  ioStreamManager.putNewInputStream(fd, fsDataInputStream, fileSystem);
  return fd;
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while open file " + path, e);
+ throw new UserException("Failed to open file " + path, e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while open path", e);
  throw new UserException("could not open file " + path, e);
@@ -1303,6 +1348,11 @@ public byte[] pread(TBrokerFD fd, long offset, long length) throws UserException
  long currentStreamOffset;
  try {
  currentStreamOffset = fsDataInputStream.getPos();
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while get file pos from output stream", e);
+ // throw unified user exception
+ throw new UserException("Failed to get file pos from output stream", e);
  } catch (IOException e) {
  LOG.error("errors while get file pos from output stream", e);
  throw new UserException("errors while get file pos from output stream");
@@ -1314,6 +1364,11 @@ public byte[] pread(TBrokerFD fd, long offset, long length) throws UserException
  + offset + " seek to it");
  try {
  fsDataInputStream.seek(offset);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while seek file pos from output stream", e);
+ // throw unified user exception
+ throw new UserException("Failed to seek file pos from output stream", e);
  } catch (IOException e) {
  throw new UserException("current read offset " + currentStreamOffset + " is not equal to "
  + offset + ", and could not seek to it");
@@ -1341,6 +1396,10 @@ public byte[] pread(TBrokerFD fd, long offset, long length) throws UserException
  System.arraycopy(buf, 0, smallerBuf, 0, readLength);
  return smallerBuf;
  }
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while read data from stream", e);
+ throw new UserException("Failed to read data from stream", e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while read data from stream", e);
  throw new UserException("errors while read data from stream", e);
@@ -1357,6 +1416,10 @@ public void closeReader(TBrokerFD fd) throws UserException {
  synchronized (fsDataInputStream) {
  try {
  fsDataInputStream.close();
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while close file input stream", e);
+ throw new UserException("Failed to close file input stream", e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while close file input stream", e);
  throw new UserException("errors while close file input stream", e);
@@ -1378,6 +1441,10 @@ public TBrokerFD openWriter(String path, Map<String, String> loadProperties) thr
  LOG.info("finish a open writer request. fd: " + fd);
  ioStreamManager.putNewOutputStream(fd, fsDataOutputStream, fileSystem);
  return fd;
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while open file " + path, e);
+ throw new UserException("Failed to open file " + path, e); // throw unified user exception
  } catch (IOException e) {
  LOG.error("errors while open path", e);
  throw new UserException("could not open file " + path, e);
@@ -1394,6 +1461,11 @@ public void pwrite(TBrokerFD fd, long offset, byte[] data) throws UserException
  }
  try {
  fsDataOutputStream.write(data);
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while write file " + fd + " to output stream", e);
+ // throw unified user exception
+ throw new UserException("Failed to write file " + fd + " to output stream", e);
  } catch (IOException e) {
  LOG.error("errors while write file " + fd + " to output stream", e);
  throw new UserException("errors while write data to output stream", e);
@@ -1407,6 +1479,11 @@ public void closeWriter(TBrokerFD fd) throws UserException {
  try {
  fsDataOutputStream.hsync();
  fsDataOutputStream.close();
+ } catch (InterruptedIOException e) {
+ Thread.interrupted(); // clear interrupted flag
+ LOG.error("Interrupted while close file " + fd + " output stream", e);
+ // throw unified user exception
+ throw new UserException("Failed to close file " + fd + " output stream", e);
  } catch (IOException e) {
  LOG.error("errors while close file " + fd + " output stream", e);
  throw new UserException("errors while close file output stream", e);