Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix all shards failed error when delivering command orders #176

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Fix all shards failed error when delivering command orders #176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
015bdf6
Fix hit.getSourceAsMap() dereferencing
f-galland Dec 6, 2024
00adc24
Cleanup code
f-galland Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 32 additions & 25 deletions ...ins/command-manager/src/main/java/com/wazuh/commandmanager/jobscheduler/SearchThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
*/
public class SearchThread implements Runnable {
public static final String COMMAND_STATUS_FIELD =
Command.COMMAND + "." + Command.STATUS + ".keyword";
Command.COMMAND + "." + Command.STATUS;
public static final String COMMAND_ORDER_ID_FIELD =
Command.COMMAND + "." + Command.ORDER_ID + ".keyword";
Command.COMMAND + "." + Command.ORDER_ID;
public static final String COMMAND_TIMEOUT_FIELD = Command.COMMAND + "." + Command.TIMEOUT;
private static final Logger log = LogManager.getLogger(SearchThread.class);
public static final String ORDERS_OBJECT = "/orders";
Expand All @@ -79,14 +79,24 @@ public SearchThread(Client client) {
*/
public static <T> T getNestedObject(Map<String, Object> map, String key, Class<T> type) {
Object value = map.get(key);
if (value == null) {
return null;
}
if (type.isInstance(value)) {
// Make a defensive copy for supported types like Map or List
if (value instanceof Map) {
return type.cast(new HashMap<>((Map<?, ?>) value));
} else if (value instanceof List) {
return type.cast(new ArrayList<>((List<?>) value));
}
// Return the value directly if it is immutable (e.g., String, Integer)
return type.cast(value);
} else {
throw new ClassCastException(
"Expected "
+ type
+ " but found "
+ (value != null ? value.getClass() : "null"));
"Expected "
+ type.getName()
+ " but found "
+ value.getClass().getName());
}
}

Expand All @@ -101,16 +111,13 @@ public static <T> T getNestedObject(Map<String, Object> map, String key, Class<T
public void handlePage(SearchResponse searchResponse) throws IllegalStateException {
SearchHits searchHits = searchResponse.getHits();
ArrayList<Object> orders = new ArrayList<>();

for (SearchHit hit : searchHits) {
// Create a JSON representation of each hit and add it to the orders array.
Map<String, Object> orderMap =
getNestedObject(hit.getSourceAsMap(), Command.COMMAND, Map.class);
// Add document id to the object.
orderMap.put("document_id", hit.getId());
orders.add(orderMap);
Map<String, Object> orderMap = getNestedObject(hit.getSourceAsMap(), Command.COMMAND, Map.class);
if (orderMap != null) {
orderMap.put("document_id", hit.getId());
orders.add(orderMap);
}
}

String payload = null;
try (XContentBuilder builder = XContentFactory.jsonBuilder()) {
payload = builder.map(Collections.singletonMap("orders", orders)).toString();
Expand Down Expand Up @@ -160,21 +167,21 @@ private SimpleHttpResponse deliverOrders(String orders) {
@SuppressWarnings("unchecked")
private void setSentStatus(SearchHit hit) throws IllegalStateException {
Map<String, Object> commandMap =
getNestedObject(
hit.getSourceAsMap(),
CommandManagerPlugin.COMMAND_DOCUMENT_PARENT_OBJECT_NAME,
Map.class);
getNestedObject(
hit.getSourceAsMap(),
CommandManagerPlugin.COMMAND_DOCUMENT_PARENT_OBJECT_NAME,
Map.class);
commandMap.put(Command.STATUS, Status.SENT);
hit.getSourceAsMap()
.put(CommandManagerPlugin.COMMAND_DOCUMENT_PARENT_OBJECT_NAME, commandMap);
.put(CommandManagerPlugin.COMMAND_DOCUMENT_PARENT_OBJECT_NAME, commandMap);
IndexRequest indexRequest =
new IndexRequest()
.index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME)
.source(hit.getSourceAsMap())
.id(hit.getId());
new IndexRequest()
.index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME)
.source(hit.getSourceAsMap())
.id(hit.getId());
this.client
.index(indexRequest)
.actionGet(CommandManagerPlugin.DEFAULT_TIMEOUT_SECONDS * 1000);
.index(indexRequest)
.actionGet(CommandManagerPlugin.DEFAULT_TIMEOUT_SECONDS * 1000);
}

/**
Expand Down