You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 07:28:30 UTC
[1/2] git commit: Explicitly made node a client
Repository: incubator-usergrid
Updated Branches:
refs/heads/index-rebuild 722c43b73 -> 8d9d4dcf0
Explicitly made node a client
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bd00ee00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bd00ee00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bd00ee00
Branch: refs/heads/index-rebuild
Commit: bd00ee0012352b5cadecedbbccd92b8c5f2622dd
Parents: 722c43b
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 16 21:48:57 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 16 21:48:57 2014 -0600
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/index/impl/EsProvider.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bd00ee00/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
index a9228ee..aac9ff5 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
@@ -163,6 +163,7 @@ public class EsProvider {
.put("client.transport.ping_timeout", 2000) // milliseconds
.put("client.transport.nodes_sampler_interval", 100)
.put("network.tcp.blocking", true)
+ .put("node.client", true)
.put("node.name", nodeName )
.build();
[2/2] git commit: Fixes migration bug
Posted by to...@apache.org.
Fixes migration bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8d9d4dcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8d9d4dcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8d9d4dcf
Branch: refs/heads/index-rebuild
Commit: 8d9d4dcf043240a9c53902b27e3daa23cd9987de
Parents: bd00ee0
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 16 23:24:50 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 16 23:24:50 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 8 +++++++
.../usergrid/corepersistence/CpWalker.java | 15 ++++++-------
.../PerformanceEntityRebuildIndexTest.java | 2 +-
.../persistence/index/impl/EsProvider.java | 22 +++++++++++++-------
.../apache/usergrid/rest/SystemResource.java | 7 ++-----
5 files changed, 33 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8d9d4dcf/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index e013957..bc45769 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -95,9 +95,15 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
public static final UUID SYSTEM_APP_ID =
UUID.fromString("b6768a08-b5d5-11e3-a495-10ddb1de66c3");
+ /**
+ * App where we store management info
+ */
public static final UUID MANAGEMENT_APPLICATION_ID =
UUID.fromString("b6768a08-b5d5-11e3-a495-11ddb1de66c8");
+ /**
+ * TODO Dave what is this?
+ */
public static final UUID DEFAULT_APPLICATION_ID =
UUID.fromString("b6768a08-b5d5-11e3-a495-11ddb1de66c9");
@@ -679,6 +685,8 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
@Override
public void rebuildInternalIndexes( ProgressObserver po ) throws Exception {
rebuildApplicationIndexes(SYSTEM_APP_ID, po);
+ rebuildApplicationIndexes( MANAGEMENT_APPLICATION_ID, po );
+ rebuildApplicationIndexes( DEFAULT_APPLICATION_ID, po );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8d9d4dcf/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index 908e6bc..636cc91 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -67,33 +67,32 @@ public class CpWalker {
}
- private void doWalkCollections( final CpEntityManager em, final Id start, final CpVisitor visitor ) {
-
- final Id fromEntityId = new SimpleId( start.getUuid(), start.getType() );
+ private void doWalkCollections( final CpEntityManager em, final Id applicationId, final CpVisitor visitor ) {
final ApplicationScope applicationScope = em.getApplicationScope();
final GraphManager gm = em.getManagerCache().getGraphManager( applicationScope );
logger.debug( "Loading edges types from {}:{}\n scope {}:{}", new Object[] {
- start.getType(), start.getUuid(), applicationScope.getApplication().getType(),
+ applicationId.getType(), applicationId.getUuid(), applicationScope.getApplication().getType(),
applicationScope.getApplication().getUuid()
} );
//only search edge types that start with collections
+
Observable<String> edgeTypes = gm.getEdgeTypesFromSource(
- new SimpleSearchEdgeType( fromEntityId, CpNamingUtils.EDGE_COLL_SUFFIX, null ) );
+ new SimpleSearchEdgeType( applicationId, CpNamingUtils.EDGE_COLL_SUFFIX+"users", null ) );
edgeTypes.flatMap( new Func1<String, Observable<Edge>>() {
@Override
public Observable<Edge> call( final String edgeType ) {
logger.debug( "Loading edges of edgeType {} from {}:{}\n scope {}:{}", new Object[] {
- edgeType, start.getType(), start.getUuid(), applicationScope.getApplication().getType(),
+ edgeType, applicationId.getType(), applicationId.getUuid(), applicationScope.getApplication().getType(),
applicationScope.getApplication().getUuid()
} );
- return gm.loadEdgesFromSource( new SimpleSearchByEdgeType( fromEntityId, edgeType, Long.MAX_VALUE,
+ return gm.loadEdgesFromSource( new SimpleSearchByEdgeType( applicationId, edgeType, Long.MAX_VALUE,
SearchByEdgeType.Order.DESCENDING, null ) );
}
} ).doOnNext( new Action1<Edge>() {
@@ -101,6 +100,8 @@ public class CpWalker {
@Override
public void call( Edge edge ) {
+ logger.info( "Re-indexing edge {}", edge );
+
EntityRef targetNodeEntityRef =
new SimpleEntityRef( edge.getTargetNode().getType(), edge.getTargetNode().getUuid() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8d9d4dcf/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 2ef65ef..ed3fd61 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
@@ -194,7 +194,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
public void onProgress( final EntityRef entity ) {
meter.mark();
- logger.debug("Indexing from {}:{}", entity.getType(), entity.getUuid());
+ logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
logger.info("Reindexed {} entities", counter );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8d9d4dcf/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
index aac9ff5..9b37952 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
@@ -31,8 +31,10 @@ import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.core.util.AvailablePortFinder;
import org.apache.usergrid.persistence.index.IndexFig;
import org.elasticsearch.client.Client;
+import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeBuilder;
import org.slf4j.Logger;
@@ -152,24 +154,28 @@ public class EsProvider {
Settings settings = ImmutableSettings.settingsBuilder()
- .put("cluster.name", fig.getClusterName())
+ .put( "cluster.name", fig.getClusterName() )
// this assumes that we're using zen for host discovery. Putting an
// explicit set of bootstrap hosts ensures we connect to a valid cluster.
- .put("discovery.zen.ping.unicast.hosts", allHosts)
- .put("discovery.zen.ping.multicast.enabled","false")
+ .put( "discovery.zen.ping.unicast.hosts", allHosts )
+ .put( "discovery.zen.ping.multicast.enabled", "false" )
.put("http.enabled", false)
- .put("client.transport.ping_timeout", 2000) // milliseconds
- .put("client.transport.nodes_sampler_interval", 100)
- .put("network.tcp.blocking", true)
- .put("node.client", true)
- .put("node.name", nodeName )
+ .put( "client.transport.ping_timeout", 2000 ) // milliseconds
+ .put( "client.transport.nodes_sampler_interval", 100 )
+ .put( "network.tcp.blocking", true )
+ .put( "node.client", true )
+ .put( "node.name", nodeName )
.build();
log.debug("Creating ElasticSearch client with settings: " + settings.getAsMap());
+ //use this client when connecting via socket only, such as ssh tunnel or other firewall issues
+// newClient = new TransportClient(settings).addTransportAddress( new InetSocketTransportAddress("localhost", 9300) );
+
+ //use this client for quick connectivity
Node node = NodeBuilder.nodeBuilder().settings(settings)
.client(true).node();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8d9d4dcf/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
index 28a7120..d068846 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
@@ -128,7 +128,7 @@ public class SystemResource extends AbstractContextResource {
@Override
public void onProgress( final EntityRef entity ) {
- logger.info( "Indexing from {}:{} ", entity.getType(), entity.getUuid() );
+ logger.info( "Indexing entity {}:{} ", entity.getType(), entity.getUuid() );
}
@@ -146,9 +146,6 @@ public class SystemResource extends AbstractContextResource {
logger.info( "Rebuilding all indexes" );
try {
- emf.rebuildInternalIndexes( po );
- emf.refreshIndex();
-
emf.rebuildAllIndexes( po );
}
catch ( Exception e ) {
@@ -252,7 +249,7 @@ public class SystemResource extends AbstractContextResource {
@Override
public void onProgress( final EntityRef entity ) {
- logger.info( "Indexing from {}:{} to {}:{} edgeType {}", entity.getType(), entity.getUuid());
+ logger.info( "Indexing entity {}:{}", entity.getType(), entity.getUuid());
}