honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more failing tests as a result of renaming (#457)

Browse Source 
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>
This commit is contained in:
Rabi Panda 2021-03-24 09:33:05 -07:00 committed by GitHub
parent 30c88e7e04
commit 2e3055c9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java
View File

@ -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;

4
modules/reindex/src/test/resources/responses/rejection.json
View File

@ -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]]"
}
} ]
},

0
plugins/examples/painless-whitelist/src/main/resources/org/elasticsearch/example/painlesswhitelist/example_whitelist.txt → plugins/examples/painless-whitelist/src/main/resources/org/opensearch/example/painlesswhitelist/example_whitelist.txt
View File

6
qa/logging-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties
View File

@ -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

2
server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
View File

@ -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()));
}