Skip to content
Snippets Groups Projects
Commit 8377e471 authored by Neelesh Thakur's avatar Neelesh Thakur
Browse files

Merge branch 'users/Vibhuti/fixingRecordIndexRetry' into 'master'

Fixing retry functionality

See merge request !205
parents 46469905 d27167a2
No related branches found
No related tags found
1 merge request!205Fixing retry functionality
Pipeline #68201 failed
...@@ -448,8 +448,8 @@ The following software have components provided under the terms of this license: ...@@ -448,8 +448,8 @@ The following software have components provided under the terms of this license:
- Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) - Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
- Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
- Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
- Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser) - Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
...@@ -552,7 +552,6 @@ The following software have components provided under the terms of this license: ...@@ -552,7 +552,6 @@ The following software have components provided under the terms of this license:
- Spring AMQP Core (from https://projects.spring.io/spring-amqp) - Spring AMQP Core (from https://projects.spring.io/spring-amqp)
- Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring AOP (from https://github.com/spring-projects/spring-framework)
- Spring Beans (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework)
- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
- Spring Context (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework)
- Spring Core (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework)
...@@ -707,6 +706,7 @@ The following software have components provided under the terms of this license: ...@@ -707,6 +706,7 @@ The following software have components provided under the terms of this license:
- spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) - spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot)
- spring-boot-starter-jersey (from https://spring.io/projects/spring-boot) - spring-boot-starter-jersey (from https://spring.io/projects/spring-boot)
- spring-boot-starter-json (from https://spring.io/projects/spring-boot) - spring-boot-starter-json (from https://spring.io/projects/spring-boot)
- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot)
- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) - spring-boot-starter-logging (from https://spring.io/projects/spring-boot)
- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) - spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot)
- spring-boot-starter-security (from https://spring.io/projects/spring-boot) - spring-boot-starter-security (from https://spring.io/projects/spring-boot)
...@@ -739,7 +739,7 @@ The following software have components provided under the terms of this license: ...@@ -739,7 +739,7 @@ The following software have components provided under the terms of this license:
- tomcat-annotations-api (from https://tomcat.apache.org/) - tomcat-annotations-api (from https://tomcat.apache.org/)
- tomcat-embed-core (from http://tomcat.apache.org/) - tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-el (from https://tomcat.apache.org/) - tomcat-embed-el (from https://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/) - tomcat-embed-websocket (from https://tomcat.apache.org/)
- xml-apis (from ) - xml-apis (from )
======================================================================== ========================================================================
...@@ -758,7 +758,7 @@ The following software have components provided under the terms of this license: ...@@ -758,7 +758,7 @@ The following software have components provided under the terms of this license:
- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Reflections (from http://code.google.com/p/reflections/) - Reflections (from http://github.com/ronmamo/reflections)
- Stax2 API (from http://github.com/FasterXML/stax2-api) - Stax2 API (from http://github.com/FasterXML/stax2-api)
- ThreeTen backport (from https://www.threeten.org/threetenbp) - ThreeTen backport (from https://www.threeten.org/threetenbp)
- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) - jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation)
...@@ -800,7 +800,7 @@ The following software have components provided under the terms of this license: ...@@ -800,7 +800,7 @@ The following software have components provided under the terms of this license:
- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
- Reflections (from http://code.google.com/p/reflections/) - Reflections (from http://github.com/ronmamo/reflections)
- SnakeYAML (from http://www.snakeyaml.org) - SnakeYAML (from http://www.snakeyaml.org)
- Spring Core (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework)
- ThreeTen backport (from https://www.threeten.org/threetenbp) - ThreeTen backport (from https://www.threeten.org/threetenbp)
...@@ -1233,7 +1233,7 @@ WTFPL ...@@ -1233,7 +1233,7 @@ WTFPL
======================================================================== ========================================================================
The following software have components provided under the terms of this license: The following software have components provided under the terms of this license:
- Reflections (from http://code.google.com/p/reflections/) - Reflections (from http://github.com/ronmamo/reflections)
======================================================================== ========================================================================
X11 X11
......
...@@ -46,7 +46,6 @@ import java.util.HashMap; ...@@ -46,7 +46,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Log @Log
@Component @Component
@RequestScope @RequestScope
...@@ -69,6 +68,10 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { ...@@ -69,6 +68,10 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder {
@Inject @Inject
private StorageService storageService; private StorageService storageService;
@Override
public void createWorkerTask(String payload, DpsHeaders headers) {
createTask(payload, headers);
}
@Override @Override
public void createWorkerTask(String payload, Long countdownMillis, DpsHeaders headers) { public void createWorkerTask(String payload, Long countdownMillis, DpsHeaders headers) {
...@@ -76,6 +79,12 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { ...@@ -76,6 +79,12 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder {
createTask(payload, headers); createTask(payload, headers);
} }
@Override
public void createReIndexTask(String payload, DpsHeaders headers) {
headers.addCorrelationIdIfMissing();
publishAllRecordsToServiceBus(payload, headers);
}
@Override @Override
public void createReIndexTask(String payload, Long countdownMillis, DpsHeaders headers) { public void createReIndexTask(String payload, Long countdownMillis, DpsHeaders headers) {
headers.addCorrelationIdIfMissing(); headers.addCorrelationIdIfMissing();
...@@ -151,7 +160,7 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { ...@@ -151,7 +160,7 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder {
message.setContentType("application/json"); message.setContentType("application/json");
try { try {
logger.debug("Indexer publishes message to Service Bus " + headers.getCorrelationId()); logger.info("Indexer publishes message to Service Bus " + headers.getCorrelationId());
topicClientFactory.getClient(headers.getPartitionId(), serviceBusReindexTopicName).send(message); topicClientFactory.getClient(headers.getPartitionId(), serviceBusReindexTopicName).send(message);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment