7ebe053ac1
Fix bug with segment loader counting thingie
2013-08-14 09:37:22 -07:00
4a64ce37ed
Finish the merging, wtf IntelliJ?
2013-08-06 13:34:24 -07:00
eee1efdcb5
Merge branch 'master' into guice
...
Conflicts:
client/src/main/java/com/metamx/druid/client/DruidServerConfig.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/index/ChatHandlerProvider.java
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
2013-08-06 13:33:31 -07:00
51f648ec11
1) Rename QueryToolChestModule back
2013-08-06 12:05:56 -07:00
69f7831d82
1) Rename QueryToolChestModule because there was a case sensitivity issue, grrr
2013-08-06 12:04:04 -07:00
c3ca9f5a3b
1) Rename MemcachedCacheConfig back to what it should be
2013-08-06 12:02:19 -07:00
9f71d42314
1) Broker works with Guice
...
2) Extract ServerViewModule to handle various ServerView thingies
3) Extract QueryToolChestModule and QueryRunnerFactoryModule to reuse code for configuration of Query stuff
4) Extract QueryJettyServerInitializer to reuse between Historical and Broker nodes
5) Remove ClientMain, BrokerMain and BrokerNode
2013-08-06 12:01:52 -07:00
ba847bff32
[maven-release-plugin] prepare for next development iteration
2013-08-05 19:58:40 -07:00
7101d9ad2e
[maven-release-plugin] prepare release druid-0.5.28
2013-08-05 19:58:34 -07:00
a1904c9b3b
ChatHandlerResource: Fix Guice type errors
2013-08-05 19:56:03 -07:00
db695f49c2
[maven-release-plugin] prepare for next development iteration
2013-08-05 18:26:20 -07:00
c22e5b7ee0
[maven-release-plugin] prepare release druid-0.5.27
2013-08-05 18:26:10 -07:00
d1b2a5a4b3
fix indexer console serde of running tasks
2013-08-05 18:22:12 -07:00
8ff0b53df4
[maven-release-plugin] prepare for next development iteration
2013-08-05 18:00:46 -07:00
1d3729906d
[maven-release-plugin] prepare release druid-0.5.26
2013-08-05 18:00:36 -07:00
479f0cefca
fix bug with RTR not assigning tasks when a new worker is available
2013-08-05 17:57:59 -07:00
90e082463b
[maven-release-plugin] prepare for next development iteration
2013-08-05 16:10:19 -07:00
eb276d34d7
[maven-release-plugin] prepare release druid-0.5.25
2013-08-05 16:10:11 -07:00
626cf14a6e
fix bug where the curator config name was changed in one place but not another; make some info msgs into debug msgs; fix zkworker serialization
2013-08-05 16:02:26 -07:00
a95d9c46e2
[maven-release-plugin] prepare for next development iteration
2013-08-05 14:47:35 -07:00
8e1f4d3256
[maven-release-plugin] prepare release druid-0.5.24
2013-08-05 14:47:26 -07:00
66c658305f
Merge branch 'master' of github.com:metamx/druid
2013-08-05 14:44:09 -07:00
35f89d7232
make RTR idempotent to multiple run requests for same task, because higher level things in the indexing service require this behaviour
2013-08-05 14:44:01 -07:00
efd34f3a8b
TaskRunner: Fix comment
2013-08-05 14:20:31 -07:00
293c0e8418
1) Clean up the servlet registration stuff, resource registrations on CliHistorical weren't working, they do now.
2013-08-05 13:58:45 -07:00
d64bc2f762
1) Eliminate Old mains() that aren't needed anymore.
2013-08-05 13:33:43 -07:00
fbb1211cbc
[maven-release-plugin] prepare for next development iteration
2013-08-05 11:44:36 -07:00
22a90d36b7
[maven-release-plugin] prepare release druid-0.5.23
2013-08-05 11:44:28 -07:00
3c808b15c3
1) Fix HadoopDruidIndexerConfigTest to actually verify the current correct behavior.
2013-08-05 11:37:20 -07:00
d6ac75cff5
Merge branch 'master' of github.com:metamx/druid
2013-08-05 11:22:37 -07:00
2b71505421
1) Fix HadoopDruidIndexerConfig to no longer replace ":" with "_" on the segmentOutputDir. The segmentOutputDir is user-supplied so they should have the ability to just not set a bad directory.
2013-08-05 11:22:26 -07:00
e1d65e736c
Merge pull request #203 from metamx/worker-resource
...
Remove retry logic out of the Remote Task Runner and introduce Task resources
2013-08-05 11:11:21 -07:00
d66af7625c
1) Eliminate the need for SingleSegmentLoader
...
2) Setup the configuration glue for ServerInventoryViews and DataSegmentAnnouncer
3) Make processes run and work again!
2013-08-02 17:05:01 -07:00
f593b23aac
Remove unused boolean parameter
2013-08-02 10:15:57 -07:00
2361e0112a
Make it all compile again...
2013-08-02 10:14:46 -07:00
c33f2f06ff
fix logic of how to assign tasks to workers
2013-08-02 09:01:02 -07:00
584ccac833
move scanning of workers and tasks into RTR start, simplify bootstrap, make tests better
2013-08-01 17:50:05 -07:00
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
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
fba2bc9623
Merge pull request #204 from metamx/close-handle
...
add the ability to unmap mmapped files
2013-08-01 14:09:46 -07:00
8f39db7804
more data to exception msgs
2013-08-01 14:04:27 -07:00
6d54ae9f81
more unit tests to test for multiple closes in different threads
2013-08-01 13:51:56 -07:00
dc169d9fcd
hide decrement and update close logic to call decrement
2013-08-01 13:24:56 -07:00
e92e0c35a4
put all concurrency test back into server manager test, introduce better concurrency for reference counting
2013-08-01 13:13:03 -07:00
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
2f8351b314
fix broken ut
2013-08-01 09:41:36 -07:00
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
a4edc2221d
fix RTR comments
2013-07-31 15:28:52 -07:00
215d147a69
Merge branch 'worker-resource' of github.com:metamx/druid into worker-resource
2013-07-31 15:23:49 -07:00
e2b5cd6067
Merge branch 'master' of github.com:metamx/druid into worker-resource
...
Conflicts:
indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
2013-07-31 15:23:13 -07:00
cheddar
Gian Merlino
fjy
cheddar