GitHub user GERey opened a pull request:
https://github.com/apache/incubator-usergrid/pull/321
Usergrid 869
Very important to note that I have added a property to decide what binary
store we should use. the property is
usergrid.binary.uploader=local
you can pick local or if you can set it to aws. To be honest it doesn't
actually matter what you change it to. It will just use the aws binary store
instead.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-usergrid USERGRID-869
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/321.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #321
----
commit 915055bc877b164512d64989f89426f6152bd69e
Author: GERey <[email protected]>
Date: 2015-07-21T17:31:11Z
Added fixes that would allow the AwsSdkS3BinaryStore to function and pass
all of the AssetResource tests.
commit ca8d1c32597c857df6310dca680bd8041029771e
Author: GERey <[email protected]>
Date: 2015-07-22T21:04:35Z
Added properties and tests for the future asset stuff.
commit c8d616a901951dacb89c4afef1090a4b9d15e3f7
Author: GERey <[email protected]>
Date: 2015-07-23T00:26:28Z
Fixed issue where the test properties weren't being properly reloaded.
commit 050aa0a035fffbb202a45251e48b542d3053a655
Author: GERey <[email protected]>
Date: 2015-07-23T19:08:08Z
Adding properties check for the asset service endpoints for testing
purposes only
changed resources to include both local and was endpoint .
Increased timeout for loading large files into s3.
Removed binary store information from test context as regular context
supports both deployments
Added log messages to AwsSdkBinaryStore
commit 2159ab1c1c98c88a26bbfd62e4d951e17b2d8661
Author: GERey <[email protected]>
Date: 2015-07-23T22:25:52Z
Created new exceptions to tell us what error is occurring in the backend
should this error occur.
Added ability to get access keys and secret keys from property files for
the awsS3 binary store.
Gave the credentials provider the ability to look up the bucket name.
Gave the NoAwsRule a catch all as a stopgap for the time being. Can't seem
to make service tier errors bubble up properly ( not that we would want to ) in
order for this hack of a rule to work.
Returns a 500 because thats this is an internal server error.
commit 63f76f40841656c2e22258ada67d28a3f4d4e5da
Author: GERey <[email protected]>
Date: 2015-07-24T14:18:56Z
Removed bucket named from the credentials provider as it wasn't working as
intended.
Added properties to the NoAwsCredsRule so it could properly register what
properties were currently in use.
Using properties in the AwsSdkBinaryStore instead of the provider.
commit d46c0400e3d16d6312ba60cad359f1446fa39a76
Author: GERey <[email protected]>
Date: 2015-07-24T15:21:06Z
Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-869
# By Dave Johnson (25) and others
# Via Dave Johnson (11) and others
* 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (36 commits)
Organize imports. This closes #318.
fix index init logic
USERGRID-771
add serialization timers
add single timer
add invoke timer
add get by name timers
Added data creator to generate data for ExportApp testing.
USERGRID-870 - Expose a config for the local datacenter name configured
in Cassandra and make it available to the Astyanax client.
rat file fix
add integration tests
Don't ignore broken user accounts (i.e. no creds or orgs), export
everything.
More consistency in logging about admin users, using username : email :
uuid format.
Ignore users with no orgs or creds, log total orgs exported and better
logging.
Duplicate user merge.
Better checks for missing creds.
Make flatmap max observables match write thread count and use
Schedulers.io() instead of a custom readScheduler.
Minor test fixes.
Less test data and code to compare 1 read and 1 write thread vs. 100 read
and 100 write threads.
Some reformatting. Also eliminating use of subscriber.unsubscribe(). All
observables need to wrap up with onCompleted().
...
commit 905b7816b1a7e578cb240e1237f9000d1d9002b5
Author: GERey <[email protected]>
Date: 2015-07-24T15:23:34Z
Delete mis named properties
commit 1fe4fe7b312ab8a07dcc66444fa1bcaf042f9bdc
Author: GERey <[email protected]>
Date: 2015-07-24T15:24:24Z
Added properly named file
commit 939b726baf318e82ed076910e15a232110e5de1c
Author: GERey <[email protected]>
Date: 2015-07-24T17:07:31Z
Added fix for account prop that has been removed.
----
---
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.
---
