refresh logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/597dfc2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/597dfc2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/597dfc2f Branch: refs/heads/USERGRID-593 Commit: 597dfc2f94ed10442f81ec7255bd073042931d33 Parents: e6390ad Author: Shawn Feldman <[email protected]> Authored: Wed Apr 29 09:32:47 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Wed Apr 29 09:32:47 2015 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/index/IndexFig.java | 4 ++-- .../persistence/index/impl/IndexRefreshCommandImpl.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/597dfc2f/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java index 505b94a..cf91da9 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java @@ -187,11 +187,11 @@ public interface IndexFig extends GuicyFig { String getClientType(); @Key("elasticsearch.refresh_search_max") - @Default("40") + @Default("25") int maxRefreshSearches(); @Key("elasticsearch.refresh_sleep_ms") - @Default("250") + @Default("100") long refreshSleep(); @Default( "5000" ) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/597dfc2f/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java index b6ca870..0abd9c4 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java @@ -117,10 +117,10 @@ public class IndexRefreshCommandImpl implements IndexRefreshCommand { */ final SearchRequestBuilder builder = - esProvider.getClient().prepareSearch( alias.getReadAlias() ).setTypes( IndexingUtils.ES_ENTITY_TYPE ) + esProvider.getClient().prepareSearch(alias.getReadAlias()).setTypes(IndexingUtils.ES_ENTITY_TYPE) //set our filter for entityId fieldname - .setPostFilter( FilterBuilders.termFilter( IndexingUtils.ENTITY_ID_FIELDNAME, entityId ) ); + .setPostFilter(FilterBuilders.termFilter(IndexingUtils.ENTITY_ID_FIELDNAME, entityId)); //start our processing immediately @@ -128,6 +128,8 @@ public class IndexRefreshCommandImpl implements IndexRefreshCommand { try { boolean found = false; for ( int i = 0; i < indexFig.maxRefreshSearches(); i++ ) { + Thread.sleep(indexFig.refreshSleep()); + final SearchResponse response = builder.execute().get(); if (response.getHits().totalHits() > 0) { @@ -135,9 +137,6 @@ public class IndexRefreshCommandImpl implements IndexRefreshCommand { break; } - if (i % 4 == 0) { - Thread.sleep(indexFig.refreshSleep()); - } } return new IndexRefreshCommandInfo(found,System.currentTimeMillis() - start);
