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 more failing tests as a result of renaming #457

Merged
merged 3 commits into from
Mar 24, 2021
Merged

Fix more failing tests as a result of renaming #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f35a47f
Fix failing tests in reindex module.
adnapibar Mar 24, 2021
31fb717
Fix logging config tests.
adnapibar Mar 24, 2021
c0bbec7
Rename directory for painless whitelist example file.
adnapibar Mar 24, 2021
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
2 changes: 1 addition & 1 deletion modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions modules/reindex/src/test/resources/responses/rejection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]"
}
} ]
},
Expand Down
0 ...e/painlesswhitelist/example_whitelist.txt → ...e/painlesswhitelist/example_whitelist.txt
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ing-config/src/test/resources/org/opensearch/common/logging/json_layout/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand Down