From 2e3055c9e28f96ff63fd5b0c472dcb228a654ee0 Mon Sep 17 00:00:00 2001
From: Rabi Panda <adnapibar@gmail.com>
Date: Wed, 24 Mar 2021 09:33:05 -0700
Subject: [PATCH] Fix more failing tests as a result of renaming (#457)
This commit fixes some more renaming issues and as a result fixes the failing tests,
* :qa:logging-config:test
* :example-plugins:painless-whitelist:yamlRestTest
* :modules:reindex:test
Signed-off-by: Rabi Panda <adnapibar@gmail.com>
---
.../index/reindex/remote/RemoteResponseParsers.java | 2 +-
modules/reindex/src/test/resources/responses/rejection.json | 4 ++--
.../example/painlesswhitelist/example_whitelist.txt | 0
.../opensearch/common/logging/json_layout/log4j2.properties | 6 +++---
.../org/opensearch/common/logging/OpenSearchJsonLayout.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
rename plugins/examples/painless-whitelist/src/main/resources/org/{elasticsearch => opensearch}/example/painlesswhitelist/example_whitelist.txt (100%)
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 bf2b230ad42..917deb9ae8f 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 @@ final class RemoteResponseParsers {
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 9bdc96cd381..0cc48bfca4f 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]]"
}
} ]
},
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
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 452caf114cb..02b32313a51 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 ab663e26cfd..503abd56489 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 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
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()));
}