From f35a47f236fa219f1b60b6586fa33f7d7039e8e3 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Tue, 23 Mar 2021 17:23:21 -0700 Subject: [PATCH 1/3] Fix failing tests in reindex module. Signed-off-by: Rabi Panda --- .../index/reindex/remote/RemoteResponseParsers.java | 2 +- modules/reindex/src/test/resources/responses/rejection.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java index bf2b230ad42ab..917deb9ae8fb2 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java @@ -241,7 +241,7 @@ private Throwable buildWithoutCause() { requireNonNull(reason, "[reason] is required"); switch (type) { // Make some effort to use the right exceptions - case "es_rejected_execution_exception": + case "rejected_execution_exception": return new OpenSearchRejectedExecutionException(reason); case "parsing_exception": XContentLocation location = null; diff --git a/modules/reindex/src/test/resources/responses/rejection.json b/modules/reindex/src/test/resources/responses/rejection.json index 9bdc96cd381aa..0cc48bfca4fb5 100644 --- a/modules/reindex/src/test/resources/responses/rejection.json +++ b/modules/reindex/src/test/resources/responses/rejection.json @@ -11,8 +11,8 @@ "index" : "test", "node" : "87A7NvevQxSrEwMbtRCecg", "reason" : { - "type" : "es_rejected_execution_exception", - "reason" : "rejected execution of org.opensearch.transport.TransportService$5@52d06af2 on EsThreadPoolExecutor[search, queue capacity = 1000, org.opensearch.common.util.concurrent.EsThreadPoolExecutor@778ea553[Running, pool size = 7, active threads = 7, queued tasks = 1000, completed tasks = 4182]]" + "type" : "rejected_execution_exception", + "reason" : "rejected execution of org.opensearch.transport.TransportService$5@52d06af2 on OpenSearchThreadPoolExecutor[search, queue capacity = 1000, org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor@778ea553[Running, pool size = 7, active threads = 7, queued tasks = 1000, completed tasks = 4182]]" } } ] }, From 31fb717c1eca4fc89a48e3e1863b1b6ba48b1ee2 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Tue, 23 Mar 2021 19:01:51 -0700 Subject: [PATCH 2/3] Fix logging config tests. Signed-off-by: Rabi Panda --- .../opensearch/common/logging/json_layout/log4j2.properties | 6 +++--- .../org/opensearch/common/logging/OpenSearchJsonLayout.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/logging-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties b/qa/logging-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties index 452caf114cbad..02b32313a51bc 100644 --- a/qa/logging-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties +++ b/qa/logging-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties @@ -14,14 +14,14 @@ appender.deprecated.name = deprecated appender.deprecated.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}_deprecated.json appender.deprecated.layout.type = OpenSearchJsonLayout appender.deprecated.layout.type_name = deprecation -appender.deprecated.layout.esmessagefields = x-opaque-id +appender.deprecated.layout.opensearchmessagefields = x-opaque-id appender.deprecated.filter.rate_limit.type = RateLimitingFilter appender.deprecatedconsole.type = Console appender.deprecatedconsole.name = deprecatedconsole appender.deprecatedconsole.layout.type = OpenSearchJsonLayout appender.deprecatedconsole.layout.type_name = deprecation -appender.deprecatedconsole.layout.esmessagefields = x-opaque-id +appender.deprecatedconsole.layout.opensearchmessagefields = x-opaque-id appender.deprecatedconsole.filter.rate_limit.type = RateLimitingFilter appender.index_search_slowlog_rolling.type = File @@ -30,7 +30,7 @@ appender.index_search_slowlog_rolling.fileName = ${sys:opensearch.logs.base_path .cluster_name}_index_search_slowlog.json appender.index_search_slowlog_rolling.layout.type = OpenSearchJsonLayout appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog -appender.index_search_slowlog_rolling.layout.esmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id +appender.index_search_slowlog_rolling.layout.opensearchmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id rootLogger.level = info rootLogger.appenderRef.console.ref = console diff --git a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java index ab663e26cfd99..503abd56489b7 100644 --- a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java +++ b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java @@ -98,7 +98,7 @@ private String pattern(String type, String[] opensearchMessageFields) { map.put("message", inQuotes("%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}")); for (String key : opensearchMessageFields) { - map.put(key, inQuotes("%opensearchMessageField{" + key + "}")); + map.put(key, inQuotes("%OpenSearchMessageField{" + key + "}")); } return createPattern(map, Stream.of(opensearchMessageFields).collect(Collectors.toSet())); } From c0bbec7d4550b6f4eb721fb0755531d64235e184 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Tue, 23 Mar 2021 19:20:14 -0700 Subject: [PATCH 3/3] Rename directory for painless whitelist example file. Signed-off-by: Rabi Panda --- .../example/painlesswhitelist/example_whitelist.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/examples/painless-whitelist/src/main/resources/org/{elasticsearch => opensearch}/example/painlesswhitelist/example_whitelist.txt (100%) diff --git a/plugins/examples/painless-whitelist/src/main/resources/org/elasticsearch/example/painlesswhitelist/example_whitelist.txt b/plugins/examples/painless-whitelist/src/main/resources/org/opensearch/example/painlesswhitelist/example_whitelist.txt similarity index 100% rename from plugins/examples/painless-whitelist/src/main/resources/org/elasticsearch/example/painlesswhitelist/example_whitelist.txt rename to plugins/examples/painless-whitelist/src/main/resources/org/opensearch/example/painlesswhitelist/example_whitelist.txt