Github user tnine commented on a diff in the pull request:
https://github.com/apache/usergrid/pull/389#discussion_r40466864
--- Diff:
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java
---
@@ -0,0 +1,209 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.usergrid.persistence.index.impl;
+
+
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.codahale.metrics.Histogram;
+import org.elasticsearch.action.WriteConsistencyLevel;
+import org.elasticsearch.action.bulk.BulkItemResponse;
+import org.elasticsearch.action.bulk.BulkRequestBuilder;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.client.Client;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
+import org.apache.usergrid.persistence.index.IndexFig;
+
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.Timer;
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import rx.Observable;
+
+
+/**
+ * Consumer for IndexOperationMessages
+ */
+@Singleton
+public class EsIndexProducerImpl implements IndexProducer {
+ private static final Logger log = LoggerFactory.getLogger(
EsIndexProducerImpl.class );
+
+ private final IndexFig config;
+ private final FailureMonitorImpl failureMonitor;
+ private final Client client;
+ private final Timer flushTimer;
+ private final IndexFig indexFig;
+ private final Counter indexSizeCounter;
+ private final Histogram roundtripTimer;
+ private final Timer indexTimer;
+
+
+ private AtomicLong inFlight = new AtomicLong();
+
+
+ @Inject
+ public EsIndexProducerImpl(final IndexFig config, final EsProvider
provider,
+ final MetricsFactory metricsFactory, final
IndexFig indexFig) {
+ this.flushTimer =
metricsFactory.getTimer(EsIndexProducerImpl.class, "index_buffer.flush");
+ this.indexSizeCounter =
metricsFactory.getCounter(EsIndexProducerImpl.class, "index_buffer.size");
+ this.roundtripTimer =
metricsFactory.getHistogram(EsIndexProducerImpl.class,
"index_buffer.message_cycle");
+
+ //wire up the gauge of inflight messages
+ metricsFactory.addGauge(EsIndexProducerImpl.class,
"index_buffer.inflight", () -> inFlight.longValue());
+
+
+ this.indexTimer = metricsFactory.getTimer(
EsIndexProducerImpl.class, "index" );
+
+ this.config = config;
+ this.failureMonitor = new FailureMonitorImpl(config, provider);
+ this.client = provider.getClient();
+ this.indexFig = indexFig;
+
+
+ //batch up sets of some size and send them in batch
+
+ }
+
+ public Observable<IndexOperationMessage> put( IndexOperationMessage
message ) {
+ Preconditions.checkNotNull(message, "Message cannot be null");
+ indexSizeCounter.inc(message.getDeIndexRequests().size());
+ indexSizeCounter.inc(message.getIndexRequests().size());
+ return processBatch(message);
+ }
+
+
+ /**
+ * Process the buffer of batches
+ * @param batch
+ * @return
+ */
+ private Observable<IndexOperationMessage> processBatch( final
IndexOperationMessage batch ) {
+
+ //take our stream of batches, then stream then into individual ops
for consumption on ES
+ final Set<IndexOperation> indexOperationSet =
batch.getIndexRequests();
+ final Set<DeIndexOperation> deIndexOperationSet =
batch.getDeIndexRequests();
+
+ final int indexOperationSetSize = indexOperationSet.size();
+ final int deIndexOperationSetSize = deIndexOperationSet.size();
+
+ log.debug("Emitting {} add and {} remove operations",
indexOperationSetSize, deIndexOperationSetSize);
+
+ indexSizeCounter.dec(indexOperationSetSize);
+ indexSizeCounter.dec(deIndexOperationSetSize);
+
+ final Observable<IndexOperation> index =
Observable.from(batch.getIndexRequests());
+ final Observable<DeIndexOperation> deIndex =
Observable.from(batch.getDeIndexRequests());
+
+ final Observable<BatchOperation> batchOps =
Observable.merge(index, deIndex);
+
+ //buffer into the max size we can send ES and fire them all off
until we're completed
+ final Observable<BulkRequestBuilder> requests =
batchOps.buffer(indexFig.getIndexBatchSize())
+ //flatten the buffer into a single batch execution
+ .flatMap(individualOps -> Observable.from(individualOps)
+ //collect them
+ .collect(() -> initRequest(), (bulkRequestBuilder,
batchOperation) -> {
+ log.debug("adding operation {} to bulkRequestBuilder
{}", batchOperation, bulkRequestBuilder);
+ batchOperation.doOperation(client, bulkRequestBuilder);
+ }))
+ //write them
+ .doOnNext(bulkRequestBuilder ->
sendRequest(bulkRequestBuilder));
+
+
+ //now that we've processed them all, ack the futures after our
last batch comes through
+ final Observable<IndexOperationMessage> processedIndexOperations =
+ requests.lastOrDefault(null).flatMap(lastRequest -> {
--- End diff --
I think you can get rid of this lastOrDefaultRight? Won't it always
contain the batch?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
