Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
45
Issues
45
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
fe5bd1db
Commit
fe5bd1db
authored
Jan 13, 2016
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch ES exceptions during adding to the genesysarchive index
parent
4c6d1532
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
12 deletions
+26
-12
src/main/java/org/genesys2/server/service/impl/ElasticsearchSearchServiceImpl.java
...2/server/service/impl/ElasticsearchSearchServiceImpl.java
+15
-11
src/main/java/org/genesys2/server/service/worker/ElasticUpdater.java
...va/org/genesys2/server/service/worker/ElasticUpdater.java
+11
-1
No files found.
src/main/java/org/genesys2/server/service/impl/ElasticsearchSearchServiceImpl.java
View file @
fe5bd1db
...
...
@@ -10,6 +10,8 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Set
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.elasticsearch.action.index.IndexRequest
;
import
org.elasticsearch.index.query.AndFilterBuilder
;
import
org.elasticsearch.index.query.FilterBuilders
;
...
...
@@ -37,8 +39,6 @@ import org.genesys2.server.service.impl.FilterHandler.MinValueFilter;
import
org.genesys2.server.service.impl.FilterHandler.StartsWithFilter
;
import
org.genesys2.server.service.impl.FilterHandler.ValueRangeFilter
;
import
org.genesys2.util.NumberUtils
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
...
...
@@ -70,17 +70,17 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
@Autowired
private
GenesysService
genesysService
;
@Autowired
private
OrganizationService
organizationService
;
//
@Autowired
//
private OrganizationService organizationService;
@Autowired
private
GenesysFilterService
filterService
;
//
@Autowired
//
private GenesysFilterService filterService;
@Autowired
private
FilterHandler
filterHandler
;
@Autowired
private
ObjectMapper
objectMapper
;
//
@Autowired
//
private ObjectMapper objectMapper;
private
final
Map
<
String
,
Class
<?>>
clazzMap
;
...
...
@@ -450,8 +450,7 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
* @param batch
*/
private
void
updateAccessionSequentialNumber
(
List
<
Object
[]>
batch
)
{
// TODO Need DATAES-159 for bulkUpdate (available in 1.3.0 M1)
// List<UpdateQuery> queries = new ArrayList<UpdateQuery>();
List
<
UpdateQuery
>
queries
=
new
ArrayList
<
UpdateQuery
>(
batch
.
size
());
List
<
Long
>
missingDocIds
=
new
ArrayList
<
Long
>(
batch
.
size
());
...
...
@@ -462,7 +461,7 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
indexRequest
.
source
(
"seqNo"
,
o
[
2
]);
UpdateQuery
updateQuery
=
new
UpdateQueryBuilder
().
withClass
(
AccessionDetails
.
class
).
withId
(
o
[
0
].
toString
()).
withIndexRequest
(
indexRequest
)
.
build
();
elasticsearchTemplate
.
update
(
updateQuery
);
queries
.
add
(
updateQuery
);
// LOG.debug("ES added seqNo to " + o[0].toString());
}
catch
(
Throwable
e
)
{
...
...
@@ -471,6 +470,11 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
}
}
if
(
queries
.
size
()
>
0
)
{
// LOG.info("Reindexing accession documents: " + queries.size());
elasticsearchTemplate
.
bulkUpdate
(
queries
);
}
if
(
missingDocIds
.
size
()
>
0
)
{
// LOG.info("Reindexing accession documents: " +
// missingDocIds.size());
...
...
src/main/java/org/genesys2/server/service/worker/ElasticUpdater.java
View file @
fe5bd1db
...
...
@@ -33,6 +33,7 @@ import org.genesys2.server.model.genesys.Accession;
import
org.genesys2.server.service.GenesysService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.elasticsearch.ElasticsearchException
;
import
org.springframework.data.elasticsearch.core.ElasticsearchTemplate
;
import
org.springframework.data.elasticsearch.core.query.IndexQuery
;
import
org.springframework.stereotype.Component
;
...
...
@@ -263,6 +264,15 @@ public class ElasticUpdater {
queries
.
add
(
iq
);
}
elasticsearchTemplate
.
bulkIndex
(
queries
);
try
{
elasticsearchTemplate
.
bulkIndex
(
queries
);
}
catch
(
ElasticsearchException
e
)
{
LOG
.
error
(
e
.
getMessage
());
Map
<
String
,
String
>
failedDocuments
=
e
.
getFailedDocuments
();
for
(
String
key
:
failedDocuments
.
keySet
())
{
LOG
.
warn
(
"ES failed document: "
+
key
+
": "
+
failedDocuments
.
get
(
key
));
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment