Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-07 18:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,487 Commits 116 Branches 507 Tags
Commit Graph

1487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cheddar
d7f9b829ac This conflict merge thing is really weird... 
Merge branch 'guice' of github.com:metamx/druid into guice

Conflicts:
	client/src/main/java/com/metamx/druid/curator/discovery/DiscoveryModule.java
	client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
	client/src/main/java/com/metamx/druid/initialization/DruidNodeConfig.java
	client/src/main/java/com/metamx/druid/initialization/EmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/HttpEmitterConfig.java
	client/src/main/java/com/metamx/druid/initialization/HttpEmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/LogEmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/ServiceDiscoveryConfig.java
	common/pom.xml
	common/src/main/java/com/metamx/druid/db/DbConnector.java
	common/src/main/java/com/metamx/druid/db/DbTablesConfig.java
	common/src/main/java/com/metamx/druid/guice/ConfigProvider.java
	common/src/main/java/com/metamx/druid/guice/DruidSecondaryModule.java
	common/src/main/java/com/metamx/druid/guice/JsonConfigProvider.java
	common/src/main/java/com/metamx/druid/guice/LifecycleModule.java
	common/src/main/java/com/metamx/druid/guice/LifecycleScope.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java
	pom.xml
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerConfig.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerConfig.java
	server/src/main/java/com/metamx/druid/guice/MasterModule.java
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentConfig.java
	server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
 2013-07-17 09:50:14 -07:00
fjy
cef0e50881 [maven-release-plugin] prepare for next development iteration 2013-07-17 09:14:37 -07:00
fjy
22526a6c68 [maven-release-plugin] prepare release druid-0.5.11 druid-0.5.11 2013-07-17 09:14:28 -07:00
fjy
43bdb99593 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:55:42 -07:00
fjy
d5fee45bf4 [maven-release-plugin] prepare release druid-0.5.10 druid-0.5.10 2013-07-16 17:55:29 -07:00
fjy
f3187b67a5 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:32:05 -07:00
fjy
eb89857bdc [maven-release-plugin] prepare release druid-0.5.9 druid-0.5.9 2013-07-16 17:31:55 -07:00
fjy
0f492e17c3 [maven-release-plugin] prepare for next development iteration 2013-07-16 16:53:51 -07:00
fjy
a3879d1151 [maven-release-plugin] prepare release druid-0.5.8 druid-0.5.8 2013-07-16 16:53:41 -07:00
fjy
4e84fb5f03 better logic for exiting load rule assign if replicants cannot be created 2013-07-16 16:50:52 -07:00
fjy
f422bfae8c [maven-release-plugin] prepare for next development iteration 2013-07-16 13:35:38 -07:00
fjy
cd174dbd80 [maven-release-plugin] prepare release druid-0.5.7 druid-0.5.7 2013-07-16 13:35:29 -07:00
fjy
afac15d631 fix version problem 2013-07-16 13:32:50 -07:00
fjy
35283789e3 Merge branch 'master' of github.com:metamx/druid 2013-07-16 13:31:06 -07:00
fjy
36756aa557 [maven-release-plugin] prepare release druid-0.5.6 2013-07-16 13:30:16 -07:00
fjy
49a80572b7 fix master speed issue with immutable copy of in druid server, better exception handling in moving and dropping segments 2013-07-16 13:24:43 -07:00
Gian Merlino
6258d77398 Retry s3 operations on non-wrapped IOExceptions 
Can happen if we get a socket related mishap while fetching an s3 object.
 2013-07-16 08:25:23 -07:00
Stefán Freyr Stefánsson
217d539e46 Adding a newline at the end of the file. 2013-07-16 15:18:03 +00:00
Stefán Freyr Stefánsson
22ec7c53fc Code cleanup and formatting, documentation and moving all configuration into the consumerProps. 2013-07-16 15:08:39 +00:00
Gian Merlino
4201d9ff24 Remove unused methods from S3Utils 2013-07-16 08:08:25 -07:00
Gian Merlino
320f1fe840 Move retryS3Operation to S3Utils 2013-07-16 08:07:14 -07:00
Gian Merlino
945bc9a370 Limited retries on s3 segment puller exceptions 
Useful for reducing spurious alerts due to general s3 flakiness.
 2013-07-16 08:03:47 -07:00
Stefán Freyr Stefánsson
d2f8e52752 Merge remote-tracking branch 'upstream/master' into rabbitmq 2013-07-16 13:08:10 +00:00
cheddar
dcc9942d8a 1) Update version of http-client 2013-07-15 14:19:05 -07:00
Stefán Freyr Stefánsson
a43ccf587f Fixed some errors in the realtime.spec and query.body files and cleaned up the format to make it more readable as an example. 2013-07-15 18:38:21 +00:00
Stefán Freyr Stefánsson
82d2623cc9 Minor sanity checks when checking for and processing a new message. 2013-07-15 15:25:59 +00:00
Stefán Freyr Stefánsson
13328a6b36 Implemented a better query.body for the test I'm using. Added a shutdown listener to the connection and channel to get a notification when they are closed. Question remains whether the connection should be re-established when that happens. 2013-07-15 09:50:58 +00:00
Stefán Freyr Stefánsson
4d998e4c27 Making more things configurable through the realtime.spec file. 2013-07-13 16:49:39 +00:00
Stefán Freyr Stefánsson
fc74333a28 adding an example dir to test the rabbitmq implementation 2013-07-13 16:14:10 +00:00
Stefán Freyr Stefánsson
01b7507a5a First version of a RabbitMQ Firehose implementation. 2013-07-13 16:03:46 +00:00
fjy
5cc747431b Merge branch 'master' into worker-resource 2013-07-12 13:00:26 -07:00
fjy
b9578a1ada 1) remove retry logic from RTR 
2) simplify configs
3) introduce task resource
4) make worker versions match coordinator version by default
 2013-07-12 12:51:12 -07:00
cheddar
09b1130810 Merge pull request #186 from rjurney/master 
Made upload.sh executable
 2013-07-11 13:06:58 -07:00
cheddar
33ac931b80 Merge pull request #185 from rjurney/test-harness 
Fixed hanging ssh bug FINALLY
 2013-07-11 13:06:02 -07:00
fjy
a190527731 Merge branch 'master' into worker-resource 2013-07-11 12:40:48 -07:00
Russell Jurney
a33aa57ca9 Made webstream example work. 2013-07-10 17:04:51 -07:00
Russell Jurney
921bee33d9 Merge branch 'master' of github.com:metamx/druid 2013-07-10 14:19:35 -07:00
cheddar
c519be5b9f 1) Fix stray imports from libraries that aren't depended on and fix annotations/methods accordingly. 2013-07-10 14:19:04 -07:00
Russell Jurney
9d9d49f9b5 Make upload script executable 2013-07-10 14:17:40 -07:00
cheddar
3778425250 1) Fix new WebStreamFirehose stuff to have tests in the tests directory 
2) Change the webStream package to the web package, because capital letters in packages suck
 2013-07-10 14:12:13 -07:00
fjy
aad11a69b4 Merge branch 'master' into worker-resource 2013-07-10 09:48:53 -07:00
Jan Rudert
ad087a7a22 correct segment path for hadoop indexer 2013-07-10 09:21:45 +02:00
Russell Jurney
a39148a0af Fixed hanging ssh bug FINALLY 2013-07-09 18:41:06 -07:00
cheddar
b83bc14784 Merge pull request #173 from metamx/dhruv 
Add new demo firehose that is lower friction than twitter
 2013-07-09 17:39:51 -07:00
Dhruv Parthasarathy
bd6dcd3973 interruption! 2013-07-09 17:39:19 -07:00
cheddar
093953c041 Merge pull request #170 from metamx/batch-zk 
Enable batched ZK announcements
 2013-07-09 17:23:47 -07:00
Dhruv Parthasarathy
ba484fca5c catch error 2013-07-09 17:17:21 -07:00
fjy
dd203f969b announcer thread fixes 2013-07-09 17:16:45 -07:00
Dhruv Parthasarathy
9f7284c801 fixed thread stuff 2013-07-09 16:59:49 -07:00
Dhruv Parthasarathy
b3157c2752 made thread final 2013-07-09 16:42:35 -07:00