You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/07/15 19:58:27 UTC
[1/3] incubator-usergrid git commit: Log total counts
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 648b5997e -> e1b352ef9
Log total counts
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/75ad454c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/75ad454c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/75ad454c
Branch: refs/heads/master
Commit: 75ad454cf23bff8dd5ad8dc84563cc1a5520db7f
Parents: b9af09e
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jul 9 15:19:34 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jul 9 15:19:34 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/usergrid/tools/ImportAdmins.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/75ad454c/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
index 4bcdc0b..0b69a98 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
@@ -625,13 +625,13 @@ public class ImportAdmins extends ToolBase {
long stopTime = System.currentTimeMillis();
long duration = stopTime - startTime;
durationSum += duration;
+ metadataCount.getAndIncrement();
count++;
-
- //logger.debug( "Imported {}th metadata", count );
if ( count % 30 == 0 ) {
- logger.info( "Imported {} metadata of total {}. Average metadata Imported Rate: {}(ms)",
- new Object[] { count, metadataCount.get(), durationSum / count });
+ logger.info( "Imported {} metadata of total {} expected. " +
+ "Average metadata Imported Rate: {}(ms)",
+ new Object[] { metadataCount.get(), userCount.get(), durationSum / count });
}
} catch (Exception e) {
@@ -694,7 +694,7 @@ public class ImportAdmins extends ToolBase {
logger.debug( "Imported admin user {} / {}",
new Object[] { uuid, entityProps.get( "username" ) } );
- userCount.addAndGet( 1 );
+ userCount.getAndIncrement();
auditQueue.put(entityProps);
long stopTime = System.currentTimeMillis();
long duration = stopTime - startTime;
@@ -702,7 +702,8 @@ public class ImportAdmins extends ToolBase {
count++;
if (count % 30 == 0) {
- logger.info( "Imported {} admin users of total {}. Average Creation Rate: {}ms",
+ logger.info( "This worked has imported {} users of total {} imported so far. " +
+ "Average Creation Rate: {}ms",
new Object[] { count, userCount.get(), durationSum / count });
}
[3/3] incubator-usergrid git commit: Better checks for missing creds.
Posted by sn...@apache.org.
Better checks for missing creds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e1b352ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e1b352ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e1b352ef
Branch: refs/heads/master
Commit: e1b352ef96da0ff687be87092c35eb3067592ee4
Parents: 9c459f4
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jul 15 13:57:40 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jul 15 13:57:40 2015 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/tools/ExportAdmins.java | 37 ++++++++------------
.../org/apache/usergrid/tools/ImportAdmins.java | 5 +--
2 files changed, 17 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e1b352ef/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
index d726ad3..2c14da1 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
@@ -315,42 +315,33 @@ public class ExportAdmins extends ExportingToolBase {
private void addDictionariesToTask(AdminUserWriteTask task, Entity entity) throws Exception {
EntityManager em = emf.getEntityManager( CassandraService.MANAGEMENT_APPLICATION_ID );
+
+ task.dictionariesByName = new HashMap<String, Map<Object, Object>>();
Set<String> dictionaries = em.getDictionaries( entity );
if ( dictionaries.isEmpty() ) {
logger.error("User {}:{} has no dictionaries", task.adminUser.getName(), task.adminUser.getUuid() );
+ return;
}
- task.dictionariesByName = new HashMap<String, Map<Object, Object>>();
+ Map<Object, Object> credentialsDictionary = em.getDictionaryAsMap( entity, "credentials" );
- for (String dictionary : dictionaries) {
- Map<Object, Object> dict = em.getDictionaryAsMap( entity, dictionary );
- if ( dict.isEmpty() ) {
- continue;
- }
- task.dictionariesByName.put( dictionary, dict );
- }
-
- if ( task.dictionariesByName.isEmpty() ) {
- logger.error( "User {}:{} has no dictionaries",
- new Object[]{task.adminUser.getName(), task.adminUser.getUuid() } );
-
- } else if ( task.dictionariesByName.get("credentials") == null ) {
- logger.error( "User {}:{} has no credentials dictionary",
- new Object[]{task.adminUser.getName(), task.adminUser.getUuid() } );
-
- } else {
- if ( task.dictionariesByName.get("credentials").get("password") == null ) {
+ if ( credentialsDictionary != null && !credentialsDictionary.isEmpty() ) {
+ task.dictionariesByName.put( "credentials", credentialsDictionary );
+
+ if (credentialsDictionary.get( "password" ) == null) {
logger.error( "User {}:{} has no password in credential dictionary",
- new Object[]{task.adminUser.getName(), task.adminUser.getUuid() } );
+ new Object[]{task.adminUser.getName(), task.adminUser.getUuid()} );
}
- if ( task.dictionariesByName.get("credentials").get("secret") == null ) {
+ if (credentialsDictionary.get( "secret" ) == null) {
logger.error( "User {}:{} has no secret in credential dictionary",
- new Object[]{task.adminUser.getName(), task.adminUser.getUuid() } );
+ new Object[]{task.adminUser.getName(), task.adminUser.getUuid()} );
}
+ } else {
+ logger.error( "User {}:{} has no or empty credentials dictionary",
+ new Object[]{task.adminUser.getName(), task.adminUser.getUuid()} );
}
-
}
private void addOrganizationsToTask(AdminUserWriteTask task) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e1b352ef/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
index 0b69a98..0b693c8 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
@@ -382,7 +382,7 @@ public class ImportAdmins extends ToolBase {
String entityOwnerId = jp.getCurrentName();
try {
- EntityRef entityRef = em.getRef( UUID.fromString( entityOwnerId ) );
+ EntityRef entityRef = em.get( UUID.fromString( entityOwnerId ) );
Map<String, Object> metadata = (Map<String, Object>) jp.readValueAs( Map.class );
workQueue.put( new ImportMetadataTask( entityRef, metadata ) );
@@ -414,7 +414,8 @@ public class ImportAdmins extends ToolBase {
User user = em.get(entityRef, User.class);
if (user == null) {
- logger.error("User with uuid={} not found, not adding to organizations");
+ logger.error("User not found, not adding to organizations: "
+ + (entityRef == null ? null : entityRef.getUuid()));
} else {
[2/3] incubator-usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Posted by sn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c459f4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c459f4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c459f4e
Branch: refs/heads/master
Commit: 9c459f4e82daf29e908ccb38a8e0b09eff3be2f0
Parents: 75ad454 648b599
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jul 15 13:56:50 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jul 15 13:56:50 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------