Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,784 Commits 111 Branches 503 Tags 726 MiB
Commit Graph

3784 Commits

Author SHA1 Message Date
fjy f3970bb1d8 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-08-08 12:44:29 -07:00
xvrl 05b791376b add note on filing bugs 2014-08-08 11:41:26 -07:00
fjy 74646f18f4 [maven-release-plugin] prepare for next development iteration 2014-08-08 11:40:52 -07:00
fjy 78c7140b52 [maven-release-plugin] prepare release druid-0.6.139 2014-08-08 11:40:46 -07:00
fjy bb44056810 prepare for next release 2014-08-08 11:38:17 -07:00
xvrl 038f2de496 Merge pull request #672 from metamx/router-strat 
Add more config to router strategies; fix bad test
 2014-08-08 11:37:35 -07:00
fjy 9803be7529 Merge pull request #673 from metamx/rt-plumber-merge-behavior 
Change merged-segment-removing behavior in RealtimePlumber.
 2014-08-08 12:24:23 -06:00
Gian Merlino 179170224d Fix conditional. 2014-08-08 11:20:36 -07:00
Gian Merlino f547049929 Change merged-segment-removing behavior in RealtimePlumber. 
Old: Merged segments are deleted upon successful push, or on IOException.
New: Merged segments are deleted on any Exception, but NOT successful push.

Deleting a merged segment means that the next merge-and-push run will try to
push it again. So we want that to happen if there was any sort of Exception.
We *don't* want it to happen if the merge-and-push was successful, since in
that case, we are just waiting for historical nodes to load the segment. It
might take a while, but there's no reason to re-push while waiting.
 2014-08-08 10:59:16 -07:00
fjy a855db2170 make things immutable 2014-08-08 10:53:10 -07:00
fjy d2c7a67a0c clean up some redundant code 2014-08-08 10:52:05 -07:00
fjy f1409f751a fix bad defaults 2014-08-08 10:46:36 -07:00
fjy d4cf2763ac fix test again 2014-08-08 10:45:59 -07:00
fjy 8877ee9714 fix test 2014-08-08 10:43:50 -07:00
fjy b3eb4cc5da fix defaults 2014-08-08 10:42:58 -07:00
fjy 627447c6f8 add more config to router strategies; fix bad test 2014-08-08 10:41:11 -07:00
xvrl 3b6bc48a51 Merge pull request #670 from metamx/fix-deadlock 
fix deadlock condition that can exist in the coordinator
 2014-08-07 16:40:16 -07:00
fjy 08c7aabb34 fix deadlock condition that can exist in the coordinator 2014-08-07 15:55:25 -07:00
fjy 91ebe45b4e support both rejectionPolicy and rejectionPolicyFactory in serde 2014-08-07 10:06:27 -07:00
fjy 0bd871e4f5 Merge pull request #663 from metamx/fix-obcs-cache-key 
Fix OrderByColumnSpec cacheKey.
 2014-08-07 10:41:37 -06:00
Gian Merlino 889c85c64f Fix OrderByColumnSpec cacheKey. 2014-08-07 06:53:34 -07:00
fjy 7624bb5ea3 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	server/src/main/java/io/druid/initialization/Initialization.java
 2014-08-06 15:47:22 -07:00
fjy e980904470 Merge pull request #662 from metamx/cleanup-cleanup 
separate cleanup of overshadowed vs. unavailable segments
 2014-08-06 15:33:24 -06:00
Xavier Léauté 87fc354237 rename CleanupAvailable -> CleanupUnneeded 2014-08-06 14:29:00 -07:00
Xavier Léauté 70660ad295 separate cleanup of overshadowed vs. unavailable segments 2014-08-06 14:06:52 -07:00
fjy 9f4dd7b33e [maven-release-plugin] prepare for next development iteration 2014-08-06 13:34:04 -07:00
fjy aa5cb91618 [maven-release-plugin] prepare release druid-0.6.138 2014-08-06 13:33:59 -07:00
fjy 57a979ef19 prepare for next release 2014-08-06 13:31:27 -07:00
fjy 8b6f030ad5 Merge pull request #661 from metamx/drop-remove-stuff 
Coordinator drop/remove related stuff.
 2014-08-06 14:28:23 -06:00
Gian Merlino 6e33cd4e0a Coordinator drop/remove related stuff. 
- DruidCoordinatorCleanup should wait for availableSegments to populate
  before dropping any segments.
- Clarify that millisToWaitBeforeDeleting applies to "removing" rather than
  "dropping" segments.
- LoadRule shouldn't need to wait for the deletionWaitTime before dropping
  excess replicas.
 2014-08-06 12:52:09 -07:00
xvrl eadbcd1b1d Merge pull request #659 from metamx/fix-metrics 
Separate query metrics into scan/time and query/time
 2014-08-05 17:02:40 -07:00
fjy 4d4c6b891e address cr 2014-08-05 15:58:42 -07:00
fjy d73492bf0f add missing final 2014-08-05 15:51:56 -07:00
fjy 8097e04938 fix naming 2014-08-05 15:48:30 -07:00
fjy 3a78960e65 Fix how metrics are emitted from servermanager 2014-08-05 15:47:30 -07:00
fjy 66225d698f fix stupidness with spatial indexing 2014-08-05 15:07:56 -07:00
Gian Merlino c58a316437 Need more synchronizing in DruidDataSource. 2014-08-05 13:32:53 -07:00
fjy 290982433b Merge pull request #657 from metamx/only-uncached-query-metrics 
Only emit query metrics for uncached queries.
 2014-08-04 18:01:18 -06:00
Gian Merlino 6c8222788b Only emit query metrics for uncached queries. 2014-08-04 16:42:38 -07:00
Xavier Léauté 8f615212a9 new deploy script that automatically submits a pull request 2014-08-01 15:42:22 -07:00
Xavier Léauté 91fc5fc82d reformatting 2014-08-01 15:28:13 -07:00
Xavier Léauté a0a12f5989 remove css from docs 2014-08-01 15:28:13 -07:00
Xavier Léauté cd5ccc39fb updated deploy script 2014-08-01 15:28:13 -07:00
fjy 6d48ffddc5 cleanup build script 2014-08-01 13:49:06 -07:00
fjy 2d0b478977 add codestyle jar file 2014-08-01 13:29:12 -07:00
fjy 305e159c93 update readme 2014-08-01 13:27:11 -07:00
fjy bd1e25363a rework the readme 2014-08-01 13:24:56 -07:00
Xavier Léauté e158aa30a7 add timeboundary docs 2014-08-01 10:44:45 -07:00
fjy 65b8278add [maven-release-plugin] prepare for next development iteration 2014-08-01 10:14:34 -07:00
fjy 0ecbef6c5d [maven-release-plugin] prepare release druid-0.6.137 2014-08-01 10:14:30 -07:00