Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07CCC17301 for ; Fri, 20 Mar 2015 01:53:42 +0000 (UTC) Received: (qmail 64835 invoked by uid 500); 20 Mar 2015 01:47:02 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 64812 invoked by uid 500); 20 Mar 2015 01:47:02 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 64803 invoked by uid 99); 20 Mar 2015 01:47:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 01:47:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFB76E1865; Fri, 20 Mar 2015 01:47:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Message-Id: <8e488665b6ef41a9be0e45de2a6f016d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-usergrid git commit: Added error logging to the iterator Date: Fri, 20 Mar 2015 01:47:01 +0000 (UTC) Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-451 61067f130 -> c7e3459ec Added error logging to the iterator Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c7e3459e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c7e3459e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c7e3459e Branch: refs/heads/USERGRID-451 Commit: c7e3459ec79ed64e74adba0c5fc9c6dc8cd12252 Parents: 61067f1 Author: Todd Nine Authored: Thu Mar 19 19:46:58 2015 -0600 Committer: Todd Nine Committed: Thu Mar 19 19:46:58 2015 -0600 ---------------------------------------------------------------------- .../java/org/apache/usergrid/persistence/ObservableIterator.java | 1 + .../usergrid/persistence/PerformanceEntityRebuildIndexTest.java | 4 +--- .../usergrid/persistence/index/impl/EsEntityIndexImpl.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7e3459e/stack/core/src/main/java/org/apache/usergrid/persistence/ObservableIterator.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/ObservableIterator.java b/stack/core/src/main/java/org/apache/usergrid/persistence/ObservableIterator.java index b91bd22..9befb79 100644 --- a/stack/core/src/main/java/org/apache/usergrid/persistence/ObservableIterator.java +++ b/stack/core/src/main/java/org/apache/usergrid/persistence/ObservableIterator.java @@ -70,6 +70,7 @@ public abstract class ObservableIterator implements Observable.OnSubscribe //if any error occurs, we need to notify the observer so it can perform it's own error handling catch ( Throwable t ) { + log.error( "Unable to emit items from iterator {}", name, t ); subscriber.onError( t ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7e3459e/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java index f1f165d..52d4a48 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java @@ -81,7 +81,6 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT { @After public void printReport() { - logger.debug("Printing metrics report"); reporter.report(); reporter.stop(); @@ -428,8 +427,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT { } if ( expectedEntities != -1 && expectedEntities != count ) { - throw new RuntimeException("Did not get expected " - + expectedEntities + " entities, instead got " + count ); + throw new RuntimeException("Did not get expected " + expectedEntities + " entities, instead got " + count ); } return count; } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7e3459e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java index 8814583..d92ae7d 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java @@ -662,7 +662,7 @@ public class EsEntityIndexImpl implements AliasedEntityIndex { if ( response.isAcknowledged() ) { logger.info( "Deleted index: read {} write {}", alias.getReadAlias(), alias.getWriteAlias()); - //invlaidate the alias + //invalidate the alias aliasCache.invalidate(alias); } else {