You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/07 10:09:42 UTC
(camel) 04/15: CAMEL-20189: camel-azure: Force marking the consumer ready sooner, in case downloading big files takes too long, causing readiness check to timeout and fail.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch ready
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 021e4a150d642220f81a0613fbf0a58ca8485f8d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 7 10:10:28 2023 +0100
CAMEL-20189: camel-azure: Force marking the consumer ready sooner, in case downloading big files takes too long, causing readiness check to timeout and fail.
---
components/camel-azure/camel-azure-files/pom.xml | 2 +-
.../META-INF/services/org/apache/camel/component.properties | 2 +-
.../java/org/apache/camel/component/file/azure/FilesConsumer.java | 3 +++
.../org/apache/camel/component/azure/storage/blob/BlobConsumer.java | 4 +++-
components/camel-azure/camel-azure-storage-datalake/pom.xml | 4 ++--
.../META-INF/services/org/apache/camel/component.properties | 4 ++--
.../camel/component/azure/storage/datalake/DataLakeConsumer.java | 6 ++++--
.../apache/camel/component/azure/storage/queue/QueueConsumer.java | 4 +++-
8 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/components/camel-azure/camel-azure-files/pom.xml b/components/camel-azure/camel-azure-files/pom.xml
index fade9b5d4d8..83fa0e15b8d 100644
--- a/components/camel-azure/camel-azure-files/pom.xml
+++ b/components/camel-azure/camel-azure-files/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-azure-files</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Azure Files</name>
+ <name>Camel :: Azure :: Files</name>
<description>Camel Azure Files Component</description>
<properties>
diff --git a/components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 86c53ac1506..6b103ed8de2 100644
--- a/components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -3,5 +3,5 @@ components=azure-files
groupId=org.apache.camel
artifactId=camel-azure-files
version=4.3.0-SNAPSHOT
-projectName=Camel :: Azure Files
+projectName=Camel :: Azure :: Files
projectDescription=Camel Azure Files Component
diff --git a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConsumer.java b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConsumer.java
index 53214c9afbd..d40d1305f3f 100644
--- a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConsumer.java
+++ b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConsumer.java
@@ -102,6 +102,9 @@ public class FilesConsumer extends RemoteFileConsumer<ShareFileItem> {
var listedFileItems = listFileItems(path);
+ // okay we have some response from azure so lets mark the consumer as ready
+ forceConsumerAsReady();
+
if (listedFileItems == null || listedFileItems.length == 0) {
LOG.trace("No files found in directory: {}", path);
return true;
diff --git a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobConsumer.java b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobConsumer.java
index be69d8b7f1e..b52c9e0855f 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobConsumer.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobConsumer.java
@@ -108,8 +108,10 @@ public class BlobConsumer extends ScheduledBatchPollingConsumer {
final List<BlobItem> blobs = (List<BlobItem>) containerOperations.listBlobs(null).getBody();
- final Queue<Exchange> exchanges = new LinkedList<>();
+ // okay we have some response from azure so lets mark the consumer as ready
+ forceConsumerAsReady();
+ final Queue<Exchange> exchanges = new LinkedList<>();
for (BlobItem blobItem : blobs) {
exchanges.add(createExchangeFromBlob(blobItem.getName(), blobContainerClient));
}
diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml
index 1790dee2519..05741b903a0 100644
--- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
+++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
@@ -29,8 +29,8 @@
<artifactId>camel-azure-storage-datalake</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Azure :: Datalake Gen2</name>
- <description>Camel Azure Datalake Gen2 Component</description>
+ <name>Camel :: Azure :: Storage Datalake</name>
+ <description>Camel Azure Datalake Component</description>
<dependencies>
<dependency>
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-azure/camel-azure-storage-datalake/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index e080e463473..653098aba29 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-azure/camel-azure-storage-datalake/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -3,5 +3,5 @@ components=azure-storage-datalake
groupId=org.apache.camel
artifactId=camel-azure-storage-datalake
version=4.3.0-SNAPSHOT
-projectName=Camel :: Azure :: Datalake Gen2
-projectDescription=Camel Azure Datalake Gen2 Component
+projectName=Camel :: Azure :: Storage Datalake
+projectDescription=Camel Azure Datalake Component
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/DataLakeConsumer.java b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/DataLakeConsumer.java
index f288230e078..ee9c739846b 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/DataLakeConsumer.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/DataLakeConsumer.java
@@ -87,15 +87,17 @@ public class DataLakeConsumer extends ScheduledBatchPollingConsumer {
= new DataLakeFileSystemOperations(getEndpoint().getConfiguration(), fileSystemClientWrapper);
final List<PathItem> items = (List<PathItem>) fileSystemOperations.listPaths(null).getBody();
- final Queue<Exchange> exchanges = new LinkedList<>();
+ // okay we have some response from azure so lets mark the consumer as ready
+ forceConsumerAsReady();
+
+ final Queue<Exchange> exchanges = new LinkedList<>();
for (PathItem pathItem : items) {
if (!pathItem.isDirectory()) {
exchanges.add(createExchangeFromFile(pathItem.getName(), dataLakeFileSystemClient));
}
}
return exchanges;
-
}
private Exchange createExchangeFromFile(final String fileName, final DataLakeFileSystemClient dataLakeFileSystemClient)
diff --git a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConsumer.java b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConsumer.java
index 9758e823768..46980783b2f 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConsumer.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConsumer.java
@@ -49,7 +49,6 @@ public class QueueConsumer extends ScheduledBatchPollingConsumer {
public QueueConsumer(final QueueEndpoint endpoint, final Processor processor) {
super(endpoint, processor);
-
}
@Override
@@ -71,6 +70,9 @@ public class QueueConsumer extends ScheduledBatchPollingConsumer {
getConfiguration().getVisibilityTimeout(),
getConfiguration().getTimeout());
+ // okay we have some response from azure so lets mark the consumer as ready
+ forceConsumerAsReady();
+
LOG.trace("Receiving messages [{}]...", messageItems);
final Queue<Exchange> exchanges = createExchanges(messageItems);