Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-06 10:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,179 Commits 115 Branches 507 Tags
Commit Graph

2696 Commits

Author SHA1 Message Date
Fangjin Yang
bf0d9c601d Merge branch 'task-stuff' into indexing_refactor 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/KillTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunnerWorkQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
 2013-02-14 15:42:07 -08:00
Gian Merlino
18daa19fc9 Merge branch 'master' into task-stuff 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java
	merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/TaskQueueTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
 2013-02-14 13:10:29 -08:00
Nelson Ray
a616f86128 add DateTime import back 2013-02-14 09:09:22 -08:00
Nelson Ray
754b065c54 merge master 2013-02-14 09:08:25 -08:00
Eric Tschetter
c5b78e75cf 1) Move up to Jackson 2.1 
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
 2013-02-13 18:51:32 -08:00
Fangjin Yang
82f02a4fe4 Merge branch 'master' into indexing_refactor 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
 2013-02-13 16:34:14 -08:00
Fangjin Yang
c7b4973700 bug fixes for RTR 2013-02-13 14:19:11 -08:00
Nelson Ray
429e23d3b2 change break to continue in BalancerCostAnalyzer to skip calculating cost when it's not necessary 2013-02-13 08:57:39 -08:00
Eric Tschetter
a0b159fed7 1) Move up to Jackson 2.1 
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
 2013-02-12 20:58:17 -06:00
Nelson Ray
fcbac96193 revert change to findNewSegmentHome: now return single ServerHolder 2013-02-12 10:47:30 -08:00
xvrl
07b0b4611b bump up to 0.3.0 2013-02-12 09:52:21 -08:00
Fangjin Yang
b27a459f71 more refactoring and UT passing at this point 2013-02-11 18:13:01 -08:00
xvrl
e9f546c4ca add default implementations to QueryToolChest methods 2013-02-11 16:51:40 -08:00
Nelson Ray
695b78b19c make findNewSegmentHome return a priority queue so assignment can assign replicants to other servers 2013-02-11 15:28:17 -08:00
xvrl
e10025c841 filter out unneeded segments for TimeBoundary query 2013-02-11 13:21:37 -08:00
Fangjin Yang
69d0d98df6 t Merge branch 'master' into indexing_refactor 2013-02-11 12:37:20 -08:00
Fangjin Yang
a9176e738a Merge branch 'master' into indexing_refactor 2013-02-11 12:36:49 -08:00
Nelson Ray
1b9764fffb add binary version to datasegments for balancer test 2013-02-11 11:36:45 -08:00
Nelson Ray
e12da51057 merge master 2013-02-11 11:28:50 -08:00
cheddar
05168808c2 Merge pull request #77 from metacret/master 
Adding LinearShardSpec and ACL on S3 object
 2013-02-11 11:12:31 -08:00
Fangjin Yang
e519f82e87 [maven-release-plugin] prepare for next development iteration 2013-02-11 10:58:51 -08:00
Fangjin Yang
73f7468a23 [maven-release-plugin] prepare release druid-0.2.7 2013-02-11 10:58:43 -08:00
Fangjin Yang
07c005a0f7 Merge branch 'master' of github.com:metamx/druid 2013-02-11 10:56:39 -08:00
Fangjin Yang
ac93f752b0 fix a case where a segment may get stuck in the terminate queue 2013-02-11 10:56:30 -08:00
Fangjin Yang
111df9a90e Merge branch 'master' into indexing_refactor 
Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
 2013-02-07 10:35:32 -08:00
xvrl
6ff42f379c fix cut-n-paste mistake in error message 2013-02-07 10:11:36 -08:00
Fangjin Yang
ec2b906fad [maven-release-plugin] prepare for next development iteration 2013-02-06 18:43:42 -08:00
Fangjin Yang
22d9607169 [maven-release-plugin] prepare release druid-0.2.6 2013-02-06 18:43:34 -08:00
Fangjin Yang
267c797023 fix bug in throttle replicants 2013-02-06 18:40:29 -08:00
Fangjin Yang
e09c658352 [maven-release-plugin] prepare for next development iteration 2013-02-06 17:42:39 -08:00
Fangjin Yang
668353e895 [maven-release-plugin] prepare release druid-0.2.5 2013-02-06 17:42:33 -08:00
Fangjin Yang
0d303bee96 reset lifetimes for the replication throttle 2013-02-06 17:41:08 -08:00
Fangjin Yang
d023d219ae [maven-release-plugin] prepare for next development iteration 2013-02-06 16:54:21 -08:00
Fangjin Yang
d0fdf4ccf0 [maven-release-plugin] prepare release druid-0.2.4 2013-02-06 16:54:16 -08:00
Fangjin Yang
7540dd58ca fix broken UT 2013-02-06 16:52:24 -08:00
fjy
e2862fe1fb Merge pull request #79 from metamx/bug_fixes 
Throttle replicants that are created by rules
 2013-02-06 16:50:04 -08:00
Fangjin Yang
84baef0462 fix some bugs from last commit 2013-02-06 13:57:56 -08:00
Fangjin Yang
97999c06c4 throttle replicants 2013-02-06 11:08:44 -08:00
Jae Hyeon Bae
4f70bbc687 adding linear shard spec and ACL for s3 bucket 2013-02-04 10:27:09 -08:00
Eric Tschetter
34b4383934 1) Adjust DataSegment to have a binaryVersion field that indicates the expected binary version of the segment files 
2) Eliminate race condition from RemoteTaskRunnerTest.testAlreadyExecutedTask()
 2013-02-01 18:59:33 -06:00
Eric Tschetter
c63eb2b77b Merge branch 'master' of github.com:metamx/druid 2013-02-01 18:39:09 -06:00
xvrl
7ec3563e7b [maven-release-plugin] prepare for next development iteration 2013-02-01 16:25:42 -08:00
xvrl
a239f62158 [maven-release-plugin] prepare release druid-0.2.3 2013-02-01 16:25:35 -08:00
Eric Tschetter
1a9edbebd3 1) whitespace 2013-02-01 16:21:26 -06:00
Eric Tschetter
5f2c3cec1b Merge branch 'master' of github.com:metamx/druid 2013-02-01 16:19:26 -06:00
Eric Tschetter
7de5c7806e 1) Some whitespace changes 
2) Fix up the alerting to actually include the segment and server for when the MasterBalancer has something stuck in the queue
 2013-02-01 16:19:17 -06:00
Fangjin Yang
9e88197845 change endpoints for killing segments 2013-02-01 14:08:52 -08:00
Nelson Ray
1c9270add3 change format of line comment 2013-02-01 11:25:41 -08:00
Nelson Ray
0b61f96965 extra documentation 2013-02-01 11:25:05 -08:00
Fangjin Yang
f50c214514 Merge branch 'master' into task-stuff 2013-01-31 09:59:52 -08:00