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

Upgrade/backend/elasticsearch #357

Merged
merged 3 commits into from
Jun 21, 2017
Merged

Upgrade/backend/elasticsearch #357

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
a378ee4
Change the way data volumes are created within docker-compose.
sapiens-sapide Jun 16, 2017
a095720
Try again to upgrade stack to use Elasticsearch v5.4.1 (ie. current v…
gdchamal Jun 21, 2017
4f55449
Restrict memory usage of ES, default is 2G
gdchamal Jun 21, 2017
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
19 changes: 15 additions & 4 deletions devtools/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
version: '2'
volumes:
index:
driver: local
db:
driver: local
store:
driver: local
services:
# Caliopen APIv2
api:
Expand Down Expand Up @@ -45,7 +52,7 @@ services:
- "9160:9160"
- "7000:7000"
volumes:
- .data/scylla:/var/lib/scylla
- db:/var/lib/scylla
entrypoint:
- /docker-entrypoint.py
- --memory
Expand All @@ -55,11 +62,15 @@ services:
#
# Used to index mail content and ensure great research performances.
elasticsearch:
image: elasticsearch:2
image: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
ports:
- "9200:9200"
environment:
- xpack.security.enabled=false
- xpack.monitoring.enabled=false
- "ES_JAVA_OPTS=-Xms512M -Xmx512M"
volumes:
- .data/elasticsearch/data:/usr/share/elasticsearch/data
- index:/usr/share/elasticsearch/data

# Caliopen cli tool
cli:
Expand Down Expand Up @@ -120,7 +131,7 @@ services:
- "9090:9090"
volumes:
- ../src/backend/configs:/configs
- .data/minio:/export
- store:/export
command:
server --address :9090 -C /configs/minio /export

Expand Down
3 changes: 1 addition & 2 deletions src/backend/main/go.backends/index/elasticsearch/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package index

import (
log "github.com/Sirupsen/logrus"
elastic "gopkg.in/olivere/elastic.v2"
elastic "gopkg.in/olivere/elastic.v5"
)

type (
Expand All @@ -29,7 +29,6 @@ func (es *ElasticSearchBackend) initialize(config ElasticSearchConfig) (err erro
// Create elastic client
es.Client, err = elastic.NewClient(
elastic.SetURL(config.Urls...),
elastic.SetSniff(false),
)

if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions src/backend/main/go.backends/index/elasticsearch/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package index

import (
"context"
"github.com/CaliOpen/Caliopen/src/backend/defs/go-objects"
log "github.com/Sirupsen/logrus"
)
Expand All @@ -13,7 +14,7 @@ func (es *ElasticSearchBackend) UpdateMessage(msg *objects.Message, fields map[s

update, err := es.Client.Update().Index(msg.User_id.String()).Type("indexed_message").Id(msg.Message_id.String()).
Doc(fields).
Do()
Do(context.TODO())
if err != nil {
log.WithError(err).Warn("backend Index: updateMessage operation failed")
return err
Expand All @@ -31,8 +32,8 @@ func (es *ElasticSearchBackend) IndexMessage(msg *objects.Message) error {

resp, err := es.Client.Index().Index(msg.User_id.String()).Type("indexed_message").Id(msg.Message_id.String()).
BodyString(string(es_msg)).
Refresh(true).
Do()
Refresh("true").
Do(context.TODO())
if err != nil {
log.WithError(err).Warn("backend Index: IndexMessage operation failed")
return err
Expand All @@ -48,7 +49,7 @@ func (es *ElasticSearchBackend) SetMessageUnread(user_id, message_id string, sta
}{status}

update := es.Client.Update().Index(user_id).Type("indexed_message").Id(message_id)
_, err = update.Doc(payload).Refresh(true).Do()
_, err = update.Doc(payload).Refresh("true").Do(context.TODO())

return
}
36 changes: 18 additions & 18 deletions src/backend/vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,12 @@
"revisionTime": "2017-05-04T04:03:14Z"
},
{
"checksumSHA1": "+alGamFQmcGTgPK66CpSfF4lYbk=",
"path": "github.com/pkg/errors",
"revision": "c605e284fe17294bda444b34710735b29d1a9d90",
"revisionTime": "2017-05-05T04:36:39Z"
},
{
"checksumSHA1": "zmC8/3V4ls53DJlNTKDZwPSC/dA=",
"path": "github.com/satori/go.uuid",
"revision": "5bf94b69c6b68ee1b541973bb8e1144db23a194b",
Expand Down Expand Up @@ -651,24 +657,18 @@
"revisionTime": "2016-08-17T06:38:38Z"
},
{
"checksumSHA1": "YaYXHmoUOYfWXu5TMM4k8ChZ8vY=",
"path": "gopkg.in/olivere/elastic.v2",
"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
"revisionTime": "2017-03-29T06:52:08Z"
},
{
"checksumSHA1": "TYefriikhzyFZ9ynNHgYUjeoHgw=",
"path": "gopkg.in/olivere/elastic.v2/backoff",
"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
"revisionTime": "2017-03-29T06:52:08Z"
},
{
"checksumSHA1": "O5dZe+m70S7vbkgePsMLrUc86DA=",
"path": "gopkg.in/olivere/elastic.v2/uritemplates",
"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
"revisionTime": "2017-03-29T06:52:08Z"
},
{
"checksumSHA1": "Ko5F2Kk9TIXHFjkriNT+CMPjIcI=",
"path": "gopkg.in/olivere/elastic.v5",
"revision": "f1fd7305d0b6270192b27010fe1193568b18e4b6",
"revisionTime": "2017-05-29T12:23:53Z"
},
{
"checksumSHA1": "pCApZfp2CeDnWbNVsyzNO62ZUXA=",
"path": "gopkg.in/olivere/elastic.v5/uritemplates",
"revision": "f1fd7305d0b6270192b27010fe1193568b18e4b6",
"revisionTime": "2017-05-29T12:23:53Z"
},
{
"checksumSHA1": "5cJY0lLgDCgPeui7ImDgvsBs3VM=",
"path": "gopkg.in/redis.v5",
"revision": "a16aeec10ff407b1e7be6dd35797ccf5426ef0f0",
Expand Down