fjy
3f51ef63a4
Merge branch 'guice' into guice-rt
2013-08-22 10:20:53 -07:00
cheddar
7ebe053ac1
Fix bug with segment loader counting thingie
2013-08-14 09:37:22 -07:00
fjy
85ee8bb267
port realtime to guice
2013-08-13 17:08:45 -07:00
cheddar
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
cheddar
51f648ec11
1) Rename QueryToolChestModule back
2013-08-06 12:05:56 -07:00
cheddar
69f7831d82
1) Rename QueryToolChestModule because there was a case sensitivity issue, grrr
2013-08-06 12:04:04 -07:00
cheddar
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
cheddar
d64bc2f762
1) Eliminate Old mains() that aren't needed anymore.
2013-08-05 13:33:43 -07:00
cheddar
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
cheddar
2361e0112a
Make it all compile again...
2013-08-02 10:14:46 -07:00
fjy
584ccac833
move scanning of workers and tasks into RTR start, simplify bootstrap, make tests better
2013-08-01 17:50:05 -07:00
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
fjy
2f8351b314
fix broken ut
2013-08-01 09:41:36 -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
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
fjy
f76540c16c
move reference counting classes out of server manager and more tests for concurrency
2013-07-31 15:14:39 -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
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
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
217894d44a
Merge branch 'master' into worker-resource
...
Conflicts:
pom.xml
2013-07-25 16:18:42 -07: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
cheddar
02ffd805c8
1) Move DbConnector into its own module
...
2) Move JacksonConfig stuff into its own module
3) Fix LogEmitterModule to inject properly with a Supplier<>
4) Set Guice to require explicit bindings, to protect from weirdness like was initially experienced with LoggingEmitterConfig
5) Master fires up and appears to all work with Guice! Whoot!
2013-07-23 14:55:36 -07:00
fjy
980b09d903
fix broken test
2013-07-23 10:19:26 -07:00
fjy
ea7c7d1d66
Merge branch 'master' into batch-zk
...
Conflicts:
client/src/main/java/com/metamx/druid/QueryableNode.java
2013-07-23 10:14:26 -07:00
fjy
ef27810458
rename to fix case issue
2013-07-22 18:02:10 -07:00
fjy
3f97ac9253
add read to batch zk
2013-07-22 18:01:13 -07:00
cheddar
7504f3ab65
1) Adjust the Announcer to cleanup parent nodes that it creates. This stops it from leaving little turdlings lying around on zookeeper as nodes exit
...
2) Rename *CuratorDataSegmentAnnouncer because neither of them depend directly on Curator.
2013-07-22 16:31:01 -07:00
cheddar
85a35201b7
1) The Master compiles and runs with Guice bindings!!!!
...
2) The service discovery stuff really needs to be reworked. It's unhappy now.
2013-07-19 16:29:54 -07:00
fjy
4e2f6380e6
Merge branch 'master' of github.com:metamx/druid
2013-07-18 13:25:08 -07:00
fjy
7d58a2d8db
fix bug with enabling segments and improve replication logic
2013-07-18 13:24:52 -07:00
