1500 Commits

Author SHA1 Message Date
cheddar
55dbda2046 1) Worker appears to be running! It's also now known as the MiddleManager 2013-08-23 17:59:48 -05:00
cheddar
613ebd54b5 1) Delete unused things 2013-08-23 14:32:14 -05:00
cheddar
b897c2cb22 1) IndexCoordinator appears to work as the CliOverlord now, yay! 2013-08-23 14:11:34 -05:00
cheddar
1aa99f5878 Merge pull request #218 from metamx/guice-rt
Port Realtime nodes to guice
2013-08-22 16:00:12 -07:00
fjy
261ef7ce56 add some fixes 2013-08-22 10:56:50 -07:00
fjy
6a8c160740 update code according to code review 2013-08-22 10:46:05 -07:00
fjy
3f51ef63a4 Merge branch 'guice' into guice-rt 2013-08-22 10:20:53 -07:00
cheddar
8980a4ace9 Merge pull request #227 from metamx/version-in-status
Add maven version to status information
2013-08-21 13:59:19 -07:00
Xavier Léauté
3adcaab1ef Eric said I did too much work
This reverts commit d5b3f7103359587ad60b5f71b31454f6e6dc71ba.
2013-08-21 13:58:02 -07:00
Xavier Léauté
d5b3f71033 replace StatusServlet with StatusResource 2013-08-21 13:51:25 -07:00
Xavier Léauté
b95d9498ca add version information to status 2013-08-21 13:37:56 -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
4a64ce37ed Finish the merging, wtf IntelliJ? 2013-08-06 13:34:24 -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
c3ca9f5a3b 1) Rename MemcachedCacheConfig back to what it should be 2013-08-06 12:02:19 -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
Gian Merlino
ba847bff32 [maven-release-plugin] prepare for next development iteration 2013-08-05 19:58:40 -07:00
Gian Merlino
7101d9ad2e [maven-release-plugin] prepare release druid-0.5.28 druid-0.5.28 2013-08-05 19:58:34 -07:00
Gian Merlino
a1904c9b3b ChatHandlerResource: Fix Guice type errors 2013-08-05 19:56:03 -07:00
fjy
db695f49c2 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:26:20 -07:00
fjy
c22e5b7ee0 [maven-release-plugin] prepare release druid-0.5.27 druid-0.5.27 2013-08-05 18:26:10 -07:00
fjy
d1b2a5a4b3 fix indexer console serde of running tasks 2013-08-05 18:22:12 -07:00
fjy
8ff0b53df4 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:00:46 -07:00
fjy
1d3729906d [maven-release-plugin] prepare release druid-0.5.26 druid-0.5.26 2013-08-05 18:00:36 -07:00
fjy
479f0cefca fix bug with RTR not assigning tasks when a new worker is available 2013-08-05 17:57:59 -07:00
fjy
90e082463b [maven-release-plugin] prepare for next development iteration 2013-08-05 16:10:19 -07:00
fjy
eb276d34d7 [maven-release-plugin] prepare release druid-0.5.25 druid-0.5.25 2013-08-05 16:10:11 -07:00
fjy
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
fjy
a95d9c46e2 [maven-release-plugin] prepare for next development iteration 2013-08-05 14:47:35 -07:00
fjy
8e1f4d3256 [maven-release-plugin] prepare release druid-0.5.24 druid-0.5.24 2013-08-05 14:47:26 -07:00
fjy
66c658305f Merge branch 'master' of github.com:metamx/druid 2013-08-05 14:44:09 -07:00
fjy
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
Gian Merlino
efd34f3a8b TaskRunner: Fix comment 2013-08-05 14:20:31 -07:00
cheddar
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
cheddar
d64bc2f762 1) Eliminate Old mains() that aren't needed anymore. 2013-08-05 13:33:43 -07:00
fjy
fbb1211cbc [maven-release-plugin] prepare for next development iteration 2013-08-05 11:44:36 -07:00
fjy
22a90d36b7 [maven-release-plugin] prepare release druid-0.5.23 druid-0.5.23 2013-08-05 11:44:28 -07:00
cheddar
3c808b15c3 1) Fix HadoopDruidIndexerConfigTest to actually verify the current correct behavior. 2013-08-05 11:37:20 -07:00
cheddar
d6ac75cff5 Merge branch 'master' of github.com:metamx/druid 2013-08-05 11:22:37 -07:00
cheddar
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
cheddar
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
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
f593b23aac Remove unused boolean parameter 2013-08-02 10:15:57 -07:00
cheddar
2361e0112a Make it all compile again... 2013-08-02 10:14:46 -07:00
fjy
c33f2f06ff fix logic of how to assign tasks to workers 2013-08-02 09:01:02 -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