Addressing PR comments

apache · Jan 29, 2025 · a2011d9 · a2011d9
1 parent 043cb31
commit a2011d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/...s/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsOutputStream.java b/...s/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsOutputStream.java
@@ -428,6 +428,7 @@ public synchronized void write(final byte[] data, final int off, final int lengt
       throw new PathIOException(path, ERR_WRITE_WITHOUT_LEASE);
     }
     if (length == 0) {
+      LOG.debug("No data to write, length is 0 for path: {}", path);
       return;
     }
 
@@ -535,6 +536,7 @@ private void uploadBlockAsync(AbfsBlock blockToUpload,
             try {
               op = remoteWrite(blockToUpload, blockUploadData, reqParams, tracingContext);
             } catch (InvalidIngressServiceException ex) {
+              LOG.debug("InvalidIngressServiceException caught for path: {}, switching handler and retrying remoteWrite.", getPath());
               switchHandler();
               // retry the operation with switched handler.
               op = remoteWrite(blockToUpload, blockUploadData, reqParams, tracingContext);
@@ -862,6 +864,7 @@ private synchronized void flushWrittenBytesToServiceInternal(final long offset,
         op = remoteFlush(offset, retainUncommitedData, isClose, leaseId,
             tracingContext);
       } catch (InvalidIngressServiceException ex) {
+        LOG.debug("InvalidIngressServiceException caught for path: {}, switching handler and retrying remoteFlush.", getPath());
         // If an invalid ingress service is encountered, switch handler and retry.
         switchHandler();
         op = remoteFlush(offset, retainUncommitedData, isClose, leaseId,

diff --git a/...oop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AzureBlobBlockManager.java b/...oop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AzureBlobBlockManager.java
@@ -146,7 +146,7 @@ protected synchronized void updateEntry(AbfsBlock block) {
    * @return whether we have some data to commit or not.
    * @throws IOException if an I/O error occurs
    */
-  protected boolean hasListToCommit() throws IOException {
+  protected synchronized boolean hasListToCommit() throws IOException {
     // Adds all the committed blocks if available to the list of blocks to be added in putBlockList.
     if (blockEntryList.isEmpty()) {
       return false; // No entries to commit

diff --git a/...p-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AzureBlobIngressHandler.java b/...p-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AzureBlobIngressHandler.java
@@ -297,6 +297,7 @@ protected void writeAppendBlobCurrentBufferToService() throws IOException {
             activeBlock, reqParams,
             new TracingContext(getAbfsOutputStream().getTracingContext()));
       } catch (InvalidIngressServiceException ex) {
+        LOG.debug("InvalidIngressServiceException caught for path: {}, switching handler and retrying remoteAppendBlobWrite.", getAbfsOutputStream().getPath());
         getAbfsOutputStream().switchHandler();
         op = getAbfsOutputStream().getIngressHandler()
             .remoteAppendBlobWrite(getAbfsOutputStream().getPath(), uploadData,

diff --git a/...ain/java/org/apache/hadoop/fs/azurebfs/services/AzureDfsToBlobIngressFallbackHandler.java b/...ain/java/org/apache/hadoop/fs/azurebfs/services/AzureDfsToBlobIngressFallbackHandler.java
@@ -239,6 +239,7 @@ protected void writeAppendBlobCurrentBufferToService() throws IOException {
             activeBlock, reqParams,
             new TracingContext(getAbfsOutputStream().getTracingContext()));
       } catch (InvalidIngressServiceException ex) {
+        LOG.debug("InvalidIngressServiceException caught for path: {}, switching handler and retrying remoteAppendBlobWrite.", getAbfsOutputStream().getPath());
         getAbfsOutputStream().switchHandler();
         op = getAbfsOutputStream().getIngressHandler()
             .remoteAppendBlobWrite(getAbfsOutputStream().getPath(), uploadData,