4a7a28a7f6
Merge branch 'master' into fix-config
2013-09-27 17:17:46 -07:00
dc5dab8747
Fixes for property conversion, firehose registration, and the indexing service
2013-09-27 17:09:59 -07:00
a79ad7bab4
make dynamic master resource configuration work again
2013-09-27 15:00:40 -07:00
0b04325ee8
fix things up according to code review comments
2013-09-27 10:17:45 -07:00
e404295c1f
make indexing service work
2013-09-26 17:44:21 -07:00
8bc56daa66
fix things up according to code review comments
2013-09-26 11:35:45 -07:00
87259321b6
port hadoop druid indexer to new guice framework
2013-09-26 11:04:42 -07:00
19276f6bad
fix spacing issues and other code review comments
2013-09-24 14:34:09 -07:00
be5bb7f2eb
fix lifecycle startup/stop ordering problem with discovery module and make druid able to load local extensions
2013-09-24 14:20:56 -07:00
1ff04412a2
clean up realtime module and fix breakage in broker paths
2013-09-23 16:26:05 -07:00
1750b702d7
Add missed com.metamx.druid.emitter.period propery to ConvertProperties
2013-09-23 16:46:37 -05:00
cc632cdb30
Make Jetty Server lazy
...
JettyServerModule had been eagerly instantiating the Server object, which was causing things that didn't care about an HTTP interface to all of a sudden require host and port parameters. The change makes the JettyServerModule only setup the bindings without eagerly instantiating the Jetty Server. Each cli needs to register the Server class with the Lifecycle in order to make it actually get used.
2013-09-23 16:02:24 -05:00
dc8a119787
fix broken unit tests are a result of the last merge
2013-09-23 12:56:01 -07:00
fefc71e34f
Refix the things that were lost in the merge.
2013-09-20 18:01:08 -05:00
b13ae3f405
Merge branch 'master' into fix-extensionization
...
Conflicts:
services/src/main/java/io/druid/cli/CliBroker.java
services/src/main/java/io/druid/cli/CliCoordinator.java
2013-09-20 17:49:13 -05:00
5712b29c8c
Fix issues with bindings and handling extensions
...
The way the Guice bindings were setup previously, each process only had bindings
for the things it cared about. This became problematic when adding extension modules
that bound everything that they could possibly need expecting that the processes would
only instantiate what they actually do need. Guice tries to fail-fast and verifies that all
bindings exist before it does anything, which is a problem because the extension bind
some objects that don't necessarily have all of their dependencies bound in all processes.
The fix for this is to build a single Injector with all bindings in it and let each of the
processes only load the things that they care about. This also requires the use of
Module overrides and other such interesting things, which are node done.
In doing the fix, I also swapped out the way that the DataSegmentPusher/Puller stuff is bound, as well as made the Cassandra stuff fail if its settings are not provided. This all of a sudden made all of the things require Cassandra's settings, so I migrated the Cassandra deep storage stuff into its own module.
In doing these changes, I also discovered that some properties weren't properly converting for the ConvertProperties command (specifically, the properties related to data segment loading and pushing), so I fixed that.
2013-09-20 17:45:01 -05:00
f26e13c61a
fix broken http endpoints
2013-09-19 17:33:58 -07:00
dc728b5721
Update versions of poms and make IncrementalIndexStorageAdapterTest compile
2013-09-18 17:01:03 -05:00
6bfe2310bb
Merge branch 'master' into guice
...
Conflicts:
client/pom.xml
client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java
indexing-common/pom.xml
indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java
realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java
realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
server/src/main/java/com/metamx/druid/BaseServerNode.java
server/src/main/java/com/metamx/druid/http/ComputeNode.java
server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java
server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
2013-09-18 16:46:54 -05:00
f7df951610
broker needs to announce itself in service discovery
2013-09-18 09:23:46 -07:00
cabae7993d
port over multi threaded realtime and also fix broken realtime nodes that can't start up
2013-09-16 16:03:47 -07:00
163fa14e62
[maven-release-plugin] prepare for next development iteration
2013-09-13 19:02:46 -07:00
a20f3fc6dd
[maven-release-plugin] prepare release druid-0.5.58
2013-09-13 19:02:40 -07:00
d0b0adbb68
[maven-release-plugin] prepare for next development iteration
2013-09-13 18:57:25 -07:00
23c5fdb107
[maven-release-plugin] prepare release druid-0.5.57
2013-09-13 18:57:20 -07:00
b0a09ba1f1
[maven-release-plugin] prepare for next development iteration
2013-09-13 18:45:20 -07:00
b17f5c403b
[maven-release-plugin] prepare release druid-0.5.56
2013-09-13 18:45:14 -07:00
30bde45556
Merge branch 'master' of github.com:metamx/druid
2013-09-13 18:41:36 -07:00
5a8b71ddec
fix how druid services is assembled
2013-09-13 18:41:33 -07:00
22a99c7589
[maven-release-plugin] prepare for next development iteration
2013-09-13 17:59:03 -07:00
542d564453
[maven-release-plugin] prepare release druid-0.5.55
2013-09-13 17:58:56 -07:00
e0738b3b22
1) Add tool to convert properties from the old settings to the new ones.
2013-09-12 17:59:23 -05:00
a2dcc45a8e
1) Remove SingleSegmentLoader and replace with OmniSegmentLoader
2013-09-12 11:47:03 -05:00
3e4a4f5566
1) Adjustments to allow for the addition of new Runnables via modules. Modules should implement CliCommandCreator and add their stuff there.
2013-09-11 17:41:20 -05:00
6c9a107356
1) remove duplicate package initialization.initialization
2013-09-09 17:02:57 -05:00
e03c623467
[maven-release-plugin] prepare for next development iteration
2013-09-05 13:48:21 -07:00
552d0c061a
[maven-release-plugin] prepare release druid-0.5.54
2013-09-05 13:48:11 -07:00
5a64e2a64a
[maven-release-plugin] prepare for next development iteration
2013-09-04 14:24:04 -07:00
523355d00b
[maven-release-plugin] prepare release druid-0.5.53
2013-09-04 14:23:56 -07:00
567168330b
[maven-release-plugin] prepare for next development iteration
2013-09-04 14:06:33 -07:00
39bda32b81
[maven-release-plugin] prepare release druid-0.5.52
2013-09-04 14:06:25 -07:00
f08b8287a4
[maven-release-plugin] prepare for next development iteration
2013-09-04 13:22:19 -07:00
cf9038abb4
[maven-release-plugin] prepare release druid-0.5.51
2013-09-04 13:22:11 -07:00
301e1896e7
Merge pull request #236 from rjurney/master
...
Edited assembly.xml to exclude the selfcontained jars, and edited path o...
2013-09-04 13:03:15 -07:00
a11eae4144
Edited assembly.xml to exclude the selfcontained jars, and edited path of run_example_server to use the lib/ directory instead of selfcontained jars, thus reducing the size of the assembly tarball from 150MB to 50MB.
2013-09-04 12:53:38 -07:00
740c70ed06
1) It's good when unit tests actually pass...
2013-08-31 17:27:15 -05:00
5ab671050e
No more com.metamx.druid, it is now all io.druid!
2013-08-30 19:42:12 -05:00
bd0756e360
More stuff moved, things still compiling and tests still passing. Yay!
2013-08-30 18:58:35 -05:00
56e2b956d0
OMG!!! A lot of stuff has been moved. Modules have been created and destroyed, but everything is compiling and unit tests are passing, OMFG this is awesome.!
2013-08-30 18:21:04 -05:00
386cc79420
[maven-release-plugin] prepare for next development iteration
2013-08-29 17:20:10 -05:00
83e5e5434e
[maven-release-plugin] prepare release druid-0.5.50
2013-08-29 17:20:05 -05:00
5ad023cd3f
Merge branch 'master' into guice
2013-08-29 13:59:59 -05:00
d9a8340dc7
[maven-release-plugin] prepare for next development iteration
2013-08-29 13:29:54 -05:00
5118e1da12
[maven-release-plugin] prepare release druid-0.5.49
2013-08-29 13:29:49 -05:00
5fa944dd26
Merge branch 'master' into guice
...
Conflicts:
client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java
client/src/main/java/com/metamx/druid/curator/announcement/Announcer.java
client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java
client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/S3TaskLogs.java
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerCuratorCoordinator.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
pom.xml
server/src/main/java/com/metamx/druid/http/MasterMain.java
server/src/main/java/com/metamx/druid/http/MasterServletModule.java
server/src/main/java/com/metamx/druid/master/DruidMasterConfig.java
server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
2013-08-27 14:27:32 -05:00
3617ac17fc
1) Eliminate ExecutorMain and have it run using the new Main!
2013-08-27 14:11:05 -05:00
269997dc94
1) ExecutorNode is working, except for the running of the task. Need to adjust it to be able to run a task and then everything will be wonderful
2013-08-26 18:08:41 -05:00
55dbda2046
1) Worker appears to be running! It's also now known as the MiddleManager
2013-08-23 17:59:48 -05:00
b897c2cb22
1) IndexCoordinator appears to work as the CliOverlord now, yay!
2013-08-23 14:11:34 -05:00
91c160ba0d
Adjust maven assembly so that the tarballs are not released to our artifactory on release.
2013-08-23 13:42:46 -05:00
344ec1ec2f
[maven-release-plugin] prepare for next development iteration
2013-08-23 13:20:09 -05:00
5b0de6eb5c
[maven-release-plugin] prepare release druid-0.5.48
2013-08-23 13:20:02 -05:00
261ef7ce56
add some fixes
2013-08-22 10:56:50 -07:00
6a8c160740
update code according to code review
2013-08-22 10:46:05 -07:00
4102dbd1e0
[maven-release-plugin] prepare for next development iteration
2013-08-21 21:50:55 -07:00
0daa2a95fe
[maven-release-plugin] prepare release druid-0.5.47
2013-08-21 21:50:46 -07:00
b1d0f989ec
[maven-release-plugin] prepare for next development iteration
2013-08-21 20:28:15 -07:00
ab467bf42a
[maven-release-plugin] prepare release druid-0.5.46
2013-08-21 20:28:06 -07:00
1037a48a8e
[maven-release-plugin] prepare for next development iteration
2013-08-21 18:55:49 -07:00
6b9ec95f01
[maven-release-plugin] prepare release druid-0.5.45
2013-08-21 18:55:40 -07:00
ed666d9d5f
[maven-release-plugin] prepare for next development iteration
2013-08-20 19:37:52 -07:00
66dcfe8c3e
[maven-release-plugin] prepare release druid-0.5.44
2013-08-20 19:37:44 -07:00
baedacf970
[maven-release-plugin] prepare for next development iteration
2013-08-20 19:29:05 -07:00
a4eb025ba7
[maven-release-plugin] prepare release druid-0.5.43
2013-08-20 19:28:56 -07:00
a3793eeba4
[maven-release-plugin] prepare for next development iteration
2013-08-20 17:58:28 -07:00
b792bf2ba5
[maven-release-plugin] prepare release druid-0.5.42
2013-08-20 17:58:22 -07:00
47ec240703
[maven-release-plugin] prepare for next development iteration
2013-08-15 13:47:57 -07:00
33e2fb3e21
[maven-release-plugin] prepare release druid-0.5.41
2013-08-15 13:47:48 -07:00
a0fcd02b3c
[maven-release-plugin] prepare for next development iteration
2013-08-14 17:03:40 -07:00
b6c445c726
[maven-release-plugin] prepare release druid-0.5.40
2013-08-14 17:03:28 -07:00
36d02ab943
[maven-release-plugin] prepare for next development iteration
2013-08-14 14:05:49 -07:00
8c841e90a4
[maven-release-plugin] prepare release druid-0.5.39
2013-08-14 14:05:39 -07:00
761a411b16
[maven-release-plugin] prepare for next development iteration
2013-08-14 10:13:50 -07:00
4dd727d974
[maven-release-plugin] prepare release druid-0.5.38
2013-08-14 10:13:34 -07:00
9870cab855
[maven-release-plugin] prepare for next development iteration
2013-08-13 17:21:56 -07:00
e4c998cfef
[maven-release-plugin] prepare release druid-0.5.37
2013-08-13 17:21:46 -07:00
85ee8bb267
port realtime to guice
2013-08-13 17:08:45 -07:00
246bd0fbaa
[maven-release-plugin] prepare for next development iteration
2013-08-13 07:27:24 -07:00
a2e9441693
[maven-release-plugin] prepare release druid-0.5.36
2013-08-13 07:27:18 -07:00
d4fc069e01
[maven-release-plugin] prepare for next development iteration
2013-08-12 18:58:14 -07:00
dd8c96c734
[maven-release-plugin] prepare release druid-0.5.35
2013-08-12 18:58:06 -07:00
1f4e0ea40c
[maven-release-plugin] prepare for next development iteration
2013-08-12 13:21:29 -07:00
1c2ad4f08c
[maven-release-plugin] prepare release druid-0.5.34
2013-08-12 13:21:21 -07:00
68a3f1ab79
[maven-release-plugin] prepare for next development iteration
2013-08-08 22:15:04 -07:00
ce5679554d
[maven-release-plugin] prepare release druid-0.5.33
2013-08-08 22:14:55 -07:00
ddc2e87c4c
[maven-release-plugin] prepare for next development iteration
2013-08-06 21:21:28 -07:00
ffbcd18cdc
[maven-release-plugin] prepare release druid-0.5.32
2013-08-06 21:21:18 -07:00
4617d37e28
[maven-release-plugin] prepare for next development iteration
2013-08-06 21:08:02 -07:00
53b248dc28
[maven-release-plugin] prepare release druid-0.5.31
2013-08-06 21:07:52 -07:00
99a3de1597
[maven-release-plugin] prepare for next development iteration
2013-08-06 17:41:58 -07:00
c0ccfd66ea
[maven-release-plugin] prepare release druid-0.5.30
2013-08-06 17:41:51 -07:00
930b089f7f
[maven-release-plugin] prepare for next development iteration
2013-08-06 16:20:37 -07:00
dd5f5ae49b
[maven-release-plugin] prepare release druid-0.5.29
2013-08-06 16:20:29 -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
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
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
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
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
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
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
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
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
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
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
b0090a1de6
[maven-release-plugin] prepare for next development iteration
2013-07-25 17:26:44 -07:00
6868153905
[maven-release-plugin] prepare release druid-0.5.22
2013-07-25 17:26:36 -07:00
cf0cb3b703
[maven-release-plugin] prepare for next development iteration
2013-07-25 16:55:28 -07:00
8297f068c3
[maven-release-plugin] prepare release druid-0.5.21
2013-07-25 16:55:20 -07:00
f68a68112f
[maven-release-plugin] prepare for next development iteration
2013-07-25 16:21:59 -07:00
b6e8d11aec
[maven-release-plugin] prepare release druid-0.5.20
2013-07-25 16:21:49 -07:00
cfc635de53
[maven-release-plugin] prepare for next development iteration
2013-07-24 09:41:30 -07:00
09576ccd09
[maven-release-plugin] prepare release druid-0.5.19
2013-07-24 09:41:20 -07:00
1b56fa5416
[maven-release-plugin] prepare for next development iteration
2013-07-18 15:37:54 -07:00
0c11602623
[maven-release-plugin] prepare release druid-0.5.18
2013-07-18 15:37:16 -07:00
816f673a47
[maven-release-plugin] prepare for next development iteration
2013-07-18 15:14:47 -07:00
bcb1b99410
[maven-release-plugin] prepare release druid-0.5.17
2013-07-18 15:14:32 -07:00
357d77aca2
[maven-release-plugin] prepare for next development iteration
2013-07-18 14:53:56 -07:00
b5b6cd6594
[maven-release-plugin] prepare release druid-0.5.16
2013-07-18 14:53:46 -07:00
08f56feee3
[maven-release-plugin] prepare for next development iteration
2013-07-18 14:48:53 -07:00
74b4c577f0
[maven-release-plugin] prepare release druid-0.5.15
2013-07-18 14:48:42 -07:00
5b55db6a42
[maven-release-plugin] prepare for next development iteration
2013-07-18 14:28:54 -07:00
3792a54869
[maven-release-plugin] prepare release druid-0.5.14
2013-07-18 14:28:46 -07:00
2f63140f2f
[maven-release-plugin] prepare for next development iteration
2013-07-18 14:17:16 -07:00
4481b10efc
[maven-release-plugin] prepare release druid-0.5.13
2013-07-18 14:16:55 -07:00
df88274d9e
fix poms
2013-07-18 14:14:16 -07:00
325a5fb4c0
[maven-release-plugin] prepare release druid-0.5.12
2013-07-18 14:09:56 -07:00
cef0e50881
[maven-release-plugin] prepare for next development iteration
2013-07-17 09:14:37 -07:00
22526a6c68
[maven-release-plugin] prepare release druid-0.5.11
2013-07-17 09:14:28 -07:00
fjy
Gian Merlino
cheddar
fjy
Russell Jurney