1431 Commits

Author SHA1 Message Date
cheddar
9e78bb38f5 Merge branch 'master' into guice
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	client/src/main/java/com/metamx/druid/client/ServerInventoryView.java
	client/src/main/java/com/metamx/druid/coordination/SingleDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
	client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java
	indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.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/coordination/ServerManager.java
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/loading/SegmentLoaderConfig.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-08-01 16:42:47 -07:00
cheddar
019bb5d453 1) Another whole bunch of changes to annotate things and create Modules and bind stuff. But OMFG, the compute node actually appears to be working!
2) The compute node works with Guice
3) The compute node fires up with Guice and appears to work
4) Did I mention that the compute node, now called historical node, fires up with Guice and appears to work?
2013-08-01 15:28:08 -07:00
cheddar
fba2bc9623 Merge pull request #204 from metamx/close-handle
add the ability to unmap mmapped files
2013-08-01 14:09:46 -07:00
fjy
8f39db7804 more data to exception msgs 2013-08-01 14:04:27 -07:00
fjy
6d54ae9f81 more unit tests to test for multiple closes in different threads 2013-08-01 13:51:56 -07:00
fjy
dc169d9fcd hide decrement and update close logic to call decrement 2013-08-01 13:24:56 -07:00
fjy
e92e0c35a4 put all concurrency test back into server manager test, introduce better concurrency for reference counting 2013-08-01 13:13:03 -07:00
fjy
b86258cc14 fix broken master UT based on changes that were discarded as part of a pull req 2013-08-01 10:44:39 -07:00
cheddar
f4fc8b2f6e 1) A whole boondoggle of changes to Guicify the instantiation of things for the Historical nodes
2) Add GuiceInjectableValues that supports @JacksonInject resolution via Guice
3) Refactor RequestLogger stuff and setup polymorphic deserialization method of creating objects
2013-07-31 18:36:47 -07:00
fjy
f76540c16c move reference counting classes out of server manager and more tests for concurrency 2013-07-31 15:14:39 -07:00
cheddar
9de2e5b096 1) Adjust JsonConfigurator to be able to attach the proper property path if it is renamed via a @JsonProperty annotation
2) JsonConfigurator now requires that fields be annotated with @JsonProperty.  It will fail fast if they aren't.
2013-07-31 14:55:34 -07:00
fjy
5d1fe50703 additional ut for reference counting 2013-07-30 17:55:57 -07:00
fjy
404b84823e reference count to make sure we arent accessing any instances of a closed mmapped segment 2013-07-30 17:36:56 -07:00
cheddar
843b6650a2 Merge pull request #206 from metamx/peontimeout
Add a timeout in LoadQueuePeon to fail an assign if it takes too long
2013-07-30 15:08:46 -07:00
fjy
e7c6dd8112 get and reset failed assign count 2013-07-30 14:50:24 -07:00
fjy
35d8a82879 move the close method to the segment object 2013-07-30 12:24:01 -07:00
cheddar
97fb971f84 1) Start the journey of making the historical nodes work with Guice. Doesn't work yet, but at least it builds. 2013-07-30 11:58:05 -07:00
cheddar
1c5c2e0ef5 Merge pull request #205 from metamx/compress-curator
Toggle between compressed and non compressed service discovery
2013-07-30 11:33:43 -07:00
cheddar
66adef5d64 Merge pull request #179 from zanox/master
Fix path used when storing segments to HDFS
2013-07-30 11:13:29 -07:00
fjy
f55e12040f fix according to code review 2013-07-29 18:39:14 -07:00
fjy
6a96c1fb76 fix according to code review comments 2013-07-29 17:56:19 -07:00
fjy
af6db21264 fix configs based on code review 2013-07-29 17:04:27 -07:00
fjy
091dce11c8 Add a timeout in LQP to fail an assign if it takes too long 2013-07-29 15:47:05 -07:00
fjy
50836798fa toggle between compressed and non compressed service discovery 2013-07-29 15:40:45 -07:00
fjy
1226190279 add the ability to close mmapped files 2013-07-29 15:22:34 -07:00
cheddar
2b587cba85 1) Introduce airlift/airline for CLI stuff and add a Coordinator CLI verb to make it all happiness 2013-07-29 15:14:20 -07:00
cheddar
4c9be81912 1) Pull try/catch check in the JettyServerInitializer out of the initializer. 2013-07-29 14:35:30 -07:00
cheddar
9cd26c70c0 1) Adjust the JettyServerModule and other things such that Jetty will actually serve the static artifacts and the various resources of the Master 2013-07-29 14:26:51 -07:00
cheddar
6b9963b472 1) Move the @Json and @Smile annotations to com.metamx.druid.guice.annotations
2) Changed ServiceAnnouncer to take a DruidNode object
3) Remove ServiceInstanceFactory interface and implementations
4) Add registrations to DiscoveryModule so that you can register nodes that should be announced on startup
5) Make the set of default Monitors configurable
2013-07-26 14:03:51 -07:00
fjy
b0090a1de6 [maven-release-plugin] prepare for next development iteration 2013-07-25 17:26:44 -07:00
fjy
6868153905 [maven-release-plugin] prepare release druid-0.5.22 druid-0.5.22 2013-07-25 17:26:36 -07:00
cheddar
a6bc63732d Merge pull request #199 from metamx/indexing-service-mods
Improve robustness and usability of RealtimeIndexTask and some code cleanup in the Indexing Service
2013-07-25 17:09:15 -07:00
fjy
cf0cb3b703 [maven-release-plugin] prepare for next development iteration 2013-07-25 16:55:28 -07:00
fjy
8297f068c3 [maven-release-plugin] prepare release druid-0.5.21 druid-0.5.21 2013-07-25 16:55:20 -07:00
Dhruv Parthasarathy
05219689e8 added close methods on inputSupplier tests 2013-07-25 16:52:29 -07:00
fjy
f68a68112f [maven-release-plugin] prepare for next development iteration 2013-07-25 16:21:59 -07:00
fjy
b6e8d11aec [maven-release-plugin] prepare release druid-0.5.20 druid-0.5.20 2013-07-25 16:21:49 -07:00
Gian Merlino
4dd42c7177 RemoteTaskActionClient: Log service uri when submitting action 2013-07-25 14:48:25 -07:00
Gian Merlino
20acd6f450 RealtimePlumberSchool: Persist and merge immediately upon finishJob 2013-07-25 14:38:07 -07:00
Gian Merlino
5d44f0f15b ForkingTaskRunner: Use guava Closer to closer stuff 2013-07-25 14:37:45 -07:00
Gian Merlino
952b8ce06b RemoteTaskActionClient: Fix http path 2013-07-25 14:37:20 -07:00
cheddar
ea201be555 Merge pull request #200 from activitystream/master
Minor fixes - maven dependency, unit test that was failing and quirk for third party S3 provider
2013-07-25 13:42:53 -07:00
cheddar
73cc47d79c Merge pull request #201 from metamx/fix-rt
Fix issue with realtime nodes selecting intervals that are too large in the results
2013-07-25 12:46:09 -07:00
fjy
a909a31bcc better select sinks 2013-07-24 19:25:32 -07:00
Stefán Freyr Stefánsson
2842a40894 Fixed test that was failing on JDK 1.7 2013-07-24 23:41:47 +00:00
Stefán Freyr Stefánsson
b3530fb15d Adding a configuration property to disable setting an ACL on the segment pushed to S3. 2013-07-24 23:37:21 +00:00
Gian Merlino
f38d7cf964 Fix busted condition 2013-07-24 16:33:01 -07:00
Gian Merlino
6d1cb1bfc1 IndexerCoordinatorResource: Log when remote task action fails 2013-07-24 16:13:12 -07:00
Gian Merlino
30d98f56c1 RealtimeIndexTask: Allow configurable rejection policies 2013-07-24 16:12:54 -07:00
Stefán Freyr Stefánsson
e3879f0c77 Adding a dependency on Apache commons httpclient in the Druid client pom.xml. It currently gets pulled in through some dependencies but it should be explicitly set. 2013-07-24 23:05:30 +00:00