Skip to content

Commit d4bd975

Browse files
committed
Pull request #1433: Upgrade elasticsearch version 7
Merge in CATS/clowder from upgrade-elasticsearch-version-7 to 2.0-work-in-progress * commit '3930461967d4a550d4cf9bbd6e95eeabe17c0594': (21 commits) Default port for elasticsearch from 9300 to 9200 since with the upgraded to v7 we now use the HTTP port to connect. Changed default Elasticsearch cluster name to `clowder` since that is what we use in the docker compose. Rolled back change to the name of the elasticsearch volume. Print exception if there is an unknown error connecting to Elasticsearch. Updates docker compose elasticsearch definition. Updated CHANGELOG.md missing bracket in Search git wars battle 3 - re-re-fix index mappings rename 75 Create ElasticsearchSearchService75.scala Recover elasticsearch changes Merge branch '2.0-work-in-progress' into upgrade-elasticsearch-version-7 Fix index creation mappings Update ElasticsearchSearchService.scala migration WIP Update ElasticsearchSearchService.scala finish integrating queue service and search service add MemoryQueue service fix parsing to SearchResult Update CHANGELOG.md overhaul of search and queue service design clean up and formalize search result handling for service ...
2 parents 5578e43 + 3930461 commit d4bd975

File tree

6 files changed

+194
-249
lines changed

6 files changed

+194
-249
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Clowder runs in a location that doesn't not have access to https://clowderframew
2424
### Changed
2525
- SpaceSharingPlugin, SpaceCopyPlugin, StagingAreaPlugin replaced with value in application.conf.
2626
- AdminNotifierPlugin replaced with AdminNotifierService
27+
- Upgraded Elasticsearch from 2.3.5 to 7.5.2.
2728

2829
## Unreleased
2930

app/api/Search.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Search @Inject() (
5151

5252
/** Search using string-encoded Json object (e.g. built by Metadata Search form) */
5353
def searchJson(query: String, grouping: String, from: Option[Int], size: Option[Int]) = PermissionAction(Permission.ViewDataset) {
54-
implicit request =>
54+
implicit request => {
5555
implicit val user = request.user
5656

5757
if (searches.isEnabled) {
@@ -61,7 +61,7 @@ class Search @Inject() (
6161
} else {
6262
BadRequest("Elasticsearch plugin could not be reached")
6363
}
64-
64+
}
6565
}
6666

6767
/**

0 commit comments

Comments
 (0)