You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/10/16 23:08:47 UTC
[1/9] usergrid git commit: Renaming to work around case issue.
Repository: usergrid
Updated Branches:
refs/heads/remove-inmemory-event-service 5b5fbf03e -> 4992f5cab
Renaming to work around case issue.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d68f4508
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d68f4508
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d68f4508
Branch: refs/heads/remove-inmemory-event-service
Commit: d68f4508b08063e18c735ee63363e8cb102c3f81
Parents: f19ae08
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 15 10:15:10 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 15 10:15:10 2015 -0400
----------------------------------------------------------------------
website/content/img/mike_d.JPG | Bin 36443 -> 0 bytes
website/content/img/miked.jpg | Bin 0 -> 36443 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d68f4508/website/content/img/mike_d.JPG
----------------------------------------------------------------------
diff --git a/website/content/img/mike_d.JPG b/website/content/img/mike_d.JPG
deleted file mode 100644
index 8dca2ee..0000000
Binary files a/website/content/img/mike_d.JPG and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d68f4508/website/content/img/miked.jpg
----------------------------------------------------------------------
diff --git a/website/content/img/miked.jpg b/website/content/img/miked.jpg
new file mode 100644
index 0000000..8dca2ee
Binary files /dev/null and b/website/content/img/miked.jpg differ
[4/9] usergrid git commit: Update the visibility timeout used when
taking messages from SQS as it overrides the queue's configured/default
timeout. Also change the queue's visibility timeout property to be exposed as
milliseconds for consistency.
Posted by sf...@apache.org.
Update the visibility timeout used when taking messages from SQS as it overrides the queue's configured/default timeout. Also change the queue's visibility timeout property to be exposed as milliseconds for consistency.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2b22c610
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2b22c610
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2b22c610
Branch: refs/heads/remove-inmemory-event-service
Commit: 2b22c610ddc3b9f9f08777fe5467713efe2ba553
Parents: 0f589f6
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Oct 15 10:23:29 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Oct 15 10:23:29 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/index/IndexProcessorFig.java | 7 +++----
.../java/org/apache/usergrid/persistence/queue/QueueFig.java | 6 +++---
.../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 2 +-
.../persistence/queue/util/AmazonNotificationUtils.java | 4 +++-
4 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b22c610/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
index 410f162..7d022e5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
@@ -62,11 +62,10 @@ public interface IndexProcessorFig extends GuicyFig {
/**
* Set the visibility timeout for messages received from the queue. (in milliseconds).
- * AWS default is also currently 30 seconds. Received messages will remain 'in flight' until
- * they are ack'd(deleted) or this timeout occurs. If the timeout occurs, the messages will become
- * visible again for re-processing.
+ * Received messages will remain 'in flight' until they are ack'd(deleted) or this timeout occurs.
+ * If the timeout occurs, the messages will become visible again for re-processing.
*/
- @Default( "30000" )
+ @Default( "5000" ) // 5 seconds
@Key( INDEX_QUEUE_VISIBILITY_TIMEOUT )
int getIndexQueueVisibilityTimeout();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b22c610/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
index 7f26bcf..0453a9b 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
@@ -76,10 +76,10 @@ public interface QueueFig extends GuicyFig {
int getAsyncQueueSize();
/**
- * Set the visibility timeout for faster retries
+ * Set the visibility timeout (in milliseconds) for faster retries
* @return
*/
@Key( "usergrid.queue.visibilityTimeout" )
- @Default("10")
- String getVisibilityTimeout();
+ @Default("5000") // 5 seconds
+ int getVisibilityTimeout();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b22c610/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index a2b5d72..d476f76 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@ -351,7 +351,7 @@ public class SNSQueueManagerImpl implements QueueManager {
ReceiveMessageRequest receiveMessageRequest = new ReceiveMessageRequest(url);
receiveMessageRequest.setMaxNumberOfMessages(limit);
- receiveMessageRequest.setVisibilityTimeout(transactionTimeout / 1000);
+ receiveMessageRequest.setVisibilityTimeout(Math.max(1, transactionTimeout / 1000));
receiveMessageRequest.setWaitTimeSeconds(waitTime / 1000);
try {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b22c610/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
index 6105592..d57870d 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
@@ -61,10 +61,12 @@ public class AmazonNotificationUtils {
.format( "{\"maxReceiveCount\":\"%s\"," + " \"deadLetterTargetArn\":\"%s\"}", fig.getQueueDeliveryLimit(),
deadletterArn );
+ final String visibilityTimeoutInSeconds = String.valueOf(Math.max(1, fig.getVisibilityTimeout() / 1000));
+
final Map<String, String> queueAttributes = new HashMap<>( 2 );
queueAttributes.put( "MessageRetentionPeriod", fig.getRetentionPeriod() );
queueAttributes.put( "RedrivePolicy", redrivePolicy );
- queueAttributes.put( "VisibilityTimeout", fig.getVisibilityTimeout() );
+ queueAttributes.put( "VisibilityTimeout", visibilityTimeoutInSeconds );
CreateQueueRequest createQueueRequest = new CreateQueueRequest().
withQueueName( queueName )
[9/9] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid into
remove-inmemory-event-service
Posted by sf...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into remove-inmemory-event-service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4992f5ca
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4992f5ca
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4992f5ca
Branch: refs/heads/remove-inmemory-event-service
Commit: 4992f5cab75b0ce0bb8c591ea00182a6dc186e64
Parents: 9673169 e7c805f
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 16 15:08:32 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 16 15:08:32 2015 -0600
----------------------------------------------------------------------
website/content/community/index.html | 2 +-
website/content/img/mike_d.JPG | Bin 36443 -> 0 bytes
website/content/img/miked.jpg | Bin 0 -> 36443 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/9] usergrid git commit: change queue impl
Posted by sf...@apache.org.
change queue impl
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4fa6749f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4fa6749f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4fa6749f
Branch: refs/heads/remove-inmemory-event-service
Commit: 4fa6749f027ece9388725dcdeb875f4bddbf7f5f
Parents: 0cc225f
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 16 15:07:36 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 16 15:07:36 2015 -0600
----------------------------------------------------------------------
.../persistence/queue/DefaultQueueManager.java | 34 ++++++++++++++++----
1 file changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/4fa6749f/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index 0ef2849..ae0b0aa 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -30,17 +30,29 @@ import java.util.UUID;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.TimeUnit;
/**
* Default queue manager implementation, uses in memory linked queue
*/
public class DefaultQueueManager implements QueueManager {
- public LinkedBlockingQueue<QueueMessage> queue = new LinkedBlockingQueue<>();
+ public ArrayBlockingQueue<QueueMessage> queue = new ArrayBlockingQueue<>(1000);
@Override
- public Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
+ public Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
List<QueueMessage> returnQueue = new ArrayList<>();
- queue.drainTo(returnQueue,1000);
+ try {
+ QueueMessage message=null;
+ int count = 10;
+ do {
+ message = queue.poll(100, TimeUnit.MILLISECONDS);
+ if (message != null) {
+ returnQueue.add(message);
+ }
+ }while(message!=null && count-->0);
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
+ }
return Observable.from( returnQueue);
}
@@ -58,17 +70,25 @@ public class DefaultQueueManager implements QueueManager {
}
@Override
- public synchronized void sendMessages(List bodies) throws IOException {
+ public void sendMessages(List bodies) throws IOException {
for(Object body : bodies){
String uuid = UUID.randomUUID().toString();
- queue.add(new QueueMessage(uuid,"handle_"+uuid,body,"putappriate type here"));
+ try {
+ queue.put(new QueueMessage(uuid, "handle_" + uuid, body, "put type here"));
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
+ }
}
}
@Override
- public synchronized void sendMessage(Object body) throws IOException {
+ public void sendMessage(Object body) throws IOException {
String uuid = UUID.randomUUID().toString();
- queue.add(new QueueMessage(uuid,"handle_"+uuid,body,"put type here"));
+ try {
+ queue.put(new QueueMessage(uuid, "handle_" + uuid, body, "put type here"));
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
+ }
}
@Override
[5/9] usergrid git commit: trying to fix inconsistency
Posted by sf...@apache.org.
trying to fix inconsistency
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0cc225f9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0cc225f9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0cc225f9
Branch: refs/heads/remove-inmemory-event-service
Commit: 0cc225f94c4239d93df23ff76df1c8b179594277
Parents: 5b5fbf0
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 15 18:28:26 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 15 18:28:26 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManager.java | 7 +++++--
.../corepersistence/index/IndexProcessorFig.java | 2 +-
.../corepersistence/StaleIndexCleanupTest.java | 16 +++++++++++-----
.../corepersistence/index/PublishRxTest.java | 2 +-
.../query/IntersectionTransitivePagingIT.java | 1 +
.../persistence/query/IteratingQueryIT.java | 4 ++--
.../persistence/queue/DefaultQueueManager.java | 4 ++--
7 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 82bb6bb..addd6ef 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -2898,14 +2898,17 @@ public class CpEntityManager implements EntityManager {
hasFinished = true;
break;
}
- Thread.sleep(250);
+ Thread.sleep(200);
+ indexRefreshCommandInfo
+ = managerCache.getEntityIndex(applicationScope).refreshAsync().toBlocking().first();
}
if(!hasFinished){
- logger.warn("Did not find entity {} during refresh.",refreshEntity.getUuid());
+ throw new RuntimeException("Did not find entity {} during refresh. uuid->"+refreshEntity.getUuid());
}
}finally {
delete(refreshEntity);
}
+
return indexRefreshCommandInfo;
} catch (Exception e) {
throw new RuntimeException("refresh failed",e);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
index 410f162..ec6024f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
@@ -73,7 +73,7 @@ public interface IndexProcessorFig extends GuicyFig {
/**
* The number of worker threads used to read index write requests from the queue.
*/
- @Default( "8" )
+ @Default( "16" )
@Key( ELASTICSEARCH_WORKER_COUNT )
int getWorkerCount();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
index df93e68..16d9a5b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
@@ -375,10 +375,6 @@ public class StaleIndexCleanupTest extends AbstractCoreIT {
// turn ON post processing stuff that cleans up stale entities
System.setProperty(EVENTS_DISABLED, "false");
- // delete all entities
- for ( Entity thing : things ) {
- em.delete( thing );
- }
Thread.sleep(250); // delete happens asynchronously, wait for some time
@@ -396,9 +392,19 @@ public class StaleIndexCleanupTest extends AbstractCoreIT {
do {
//trigger the repair
results = queryCollectionEm("things", "select *");
+ results.getEntities().stream().forEach(entity -> {
+ try {
+ em.delete(entity);
+ }catch (Exception e){
+ //
+ }
+ });
+ //refresh the app index
+ app.refreshIndex();
+
crs = queryCollectionCp("things", "thing", "select *");
- } while ((results.hasCursor() || crs.size() > 0) && count++ < 2000 );
+ } while ( crs.size() > 0 && count++ < 2000 );
Assert.assertEquals( "Expect no candidates", 0, crs.size() );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/PublishRxTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/PublishRxTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/PublishRxTest.java
index 973a42d..c0ed57a 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/PublishRxTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/PublishRxTest.java
@@ -52,7 +52,7 @@ public class PublishRxTest {
.subscribe();
- final boolean completed = latch.await( 5, TimeUnit.SECONDS );
+ final boolean completed = latch.await( 3, TimeUnit.SECONDS );
assertTrue( "publish1 behaves as expected", completed );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/test/java/org/apache/usergrid/persistence/query/IntersectionTransitivePagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IntersectionTransitivePagingIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IntersectionTransitivePagingIT.java
index 4490a22..aee643b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IntersectionTransitivePagingIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IntersectionTransitivePagingIT.java
@@ -133,6 +133,7 @@ public class IntersectionTransitivePagingIT{
}
this.app.refreshIndex();
+ Thread.sleep(1000);
return expected;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
index d882f78..e589be4 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/IteratingQueryIT.java
@@ -299,6 +299,7 @@ public class IteratingQueryIT {
}
app.refreshIndex();
+ Thread.sleep(1000);
long stop = System.currentTimeMillis();
LOG.info( "Writes took {} ms", stop - start );
@@ -387,8 +388,7 @@ public class IteratingQueryIT {
results = io.getResults( query );
for ( int i = 0 ; i< results.size(); i++) {
- assertEquals( expected.get( count ), results.getEntities().get( i ).getName() );
- count++;
+ assertEquals( expected.get( count++ ), results.getEntities().get( i ).getName() );
}
query.setCursor( results.getCursor() );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0cc225f9/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index d9a141e..0ef2849 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -38,9 +38,9 @@ public class DefaultQueueManager implements QueueManager {
public LinkedBlockingQueue<QueueMessage> queue = new LinkedBlockingQueue<>();
@Override
- public synchronized Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
+ public Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
List<QueueMessage> returnQueue = new ArrayList<>();
- queue.drainTo(returnQueue,10);
+ queue.drainTo(returnQueue,1000);
return Observable.from( returnQueue);
}
[7/9] usergrid git commit: change queue impl
Posted by sf...@apache.org.
change queue impl
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b6f8e711
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b6f8e711
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b6f8e711
Branch: refs/heads/remove-inmemory-event-service
Commit: b6f8e711c7a0eb2334a0b92cd826615d0b413392
Parents: 4fa6749
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 16 15:08:11 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 16 15:08:11 2015 -0600
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/queue/DefaultQueueManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b6f8e711/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index ae0b0aa..a6bc8cf 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -49,7 +49,7 @@ public class DefaultQueueManager implements QueueManager {
if (message != null) {
returnQueue.add(message);
}
- }while(message!=null && count-->0);
+ }while(queue.size()>0 && count-->0);
}catch (InterruptedException ie){
throw new RuntimeException(ie);
}
[2/9] usergrid git commit: Renaming to work around case issue.
Posted by sf...@apache.org.
Renaming to work around case issue.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ec2c4478
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ec2c4478
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ec2c4478
Branch: refs/heads/remove-inmemory-event-service
Commit: ec2c4478875a8d7be4af3c770c3523d43e656e4f
Parents: d68f450
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 15 10:15:52 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 15 10:15:52 2015 -0400
----------------------------------------------------------------------
website/content/img/mike_d.jpg | Bin 0 -> 36443 bytes
website/content/img/miked.jpg | Bin 36443 -> 0 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/ec2c4478/website/content/img/mike_d.jpg
----------------------------------------------------------------------
diff --git a/website/content/img/mike_d.jpg b/website/content/img/mike_d.jpg
new file mode 100644
index 0000000..8dca2ee
Binary files /dev/null and b/website/content/img/mike_d.jpg differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/ec2c4478/website/content/img/miked.jpg
----------------------------------------------------------------------
diff --git a/website/content/img/miked.jpg b/website/content/img/miked.jpg
deleted file mode 100644
index 8dca2ee..0000000
Binary files a/website/content/img/miked.jpg and /dev/null differ
[3/9] usergrid git commit: Another try at rename.
Posted by sf...@apache.org.
Another try at rename.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e7c805f1
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e7c805f1
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e7c805f1
Branch: refs/heads/remove-inmemory-event-service
Commit: e7c805f1e055c2bc2ad5ccb61aee9039488ff7a2
Parents: ec2c447
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 15 11:02:49 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 15 11:02:49 2015 -0400
----------------------------------------------------------------------
website/content/community/index.html | 2 +-
website/content/img/mike_d.jpg | Bin 36443 -> 0 bytes
website/content/img/miked.jpg | Bin 0 -> 36443 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e7c805f1/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/website/content/community/index.html b/website/content/community/index.html
index 1d5e479..6dacd6a 100644
--- a/website/content/community/index.html
+++ b/website/content/community/index.html
@@ -167,7 +167,7 @@
<p>George Reyes</p>
</div>
<div class="col-md-2 text-center">
- <img src="/img/mike_d.jpg" />
+ <img src="/img/miked.jpg" />
<p>Mike Dunker</p>
</div>
<div class="col-md-2 text-center">
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e7c805f1/website/content/img/mike_d.jpg
----------------------------------------------------------------------
diff --git a/website/content/img/mike_d.jpg b/website/content/img/mike_d.jpg
deleted file mode 100644
index 8dca2ee..0000000
Binary files a/website/content/img/mike_d.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e7c805f1/website/content/img/miked.jpg
----------------------------------------------------------------------
diff --git a/website/content/img/miked.jpg b/website/content/img/miked.jpg
new file mode 100644
index 0000000..8dca2ee
Binary files /dev/null and b/website/content/img/miked.jpg differ
[8/9] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid into
remove-inmemory-event-service
Posted by sf...@apache.org.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into remove-inmemory-event-service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9673169d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9673169d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9673169d
Branch: refs/heads/remove-inmemory-event-service
Commit: 9673169dc7c28167ccf391496afd7faeaaffd321
Parents: b6f8e71 2b22c61
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 16 15:08:18 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 16 15:08:18 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/index/IndexProcessorFig.java | 7 +++----
.../java/org/apache/usergrid/persistence/queue/QueueFig.java | 6 +++---
.../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 2 +-
.../persistence/queue/util/AmazonNotificationUtils.java | 4 +++-
4 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/9673169d/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
----------------------------------------------------------------------