Permalink
Browse files

merged conflicted sources

  • Loading branch information...
2 parents f5b8c7d + 5a021db commit ed6ddd359ecb91f3f310f673a8ac93adf727999c @baepiff baepiff committed Oct 19, 2012
Showing with 26,078 additions and 2,627 deletions.
  1. +5 −2 .classpath
  2. +1 −0 .gitignore
  3. +4 −4 .settings/org.eclipse.jdt.core.prefs
  4. +7 −0 META-INF/MANIFEST.MF
  5. +87 −39 bin/generate_cluster_xml.py
  6. +93 −0 bin/repeat-junit-test.sh
  7. +75 −0 bin/repeat-junit.sh
  8. +6 −1 build.properties
  9. +51 −8 build.xml
  10. +4 −0 clients/python/voldemort/client.py
  11. +94 −5 clients/python/voldemort/protocol/voldemort_admin_pb2.py
  12. +39 −32 config/single_node_cluster/config/stores.xml
  13. +5 −5 contrib/ec2-testing/test/voldemort/utils/Ec2FailureDetectorTest.java
  14. +2 −1 ...hadoop-store-builder/perf/voldemort/contrib/batchindexer/performance/BdbBuildPerformanceTest.java
  15. +2 −1 ...doop-store-builder/perf/voldemort/contrib/batchindexer/performance/MysqlBuildPerformanceTest.java
  16. +339 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/disk/HadoopStoreWriter.java
  17. +358 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/disk/HadoopStoreWriterPerBucket.java
  18. +40 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/disk/KeyValueWriter.java
  19. +59 −37 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
  20. +20 −88 ...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractHadoopStoreBuilderMapper.java
  21. +255 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AvroStoreBuilderMapper.java
  22. +150 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AvroStoreBuilderPartitioner.java
  23. +115 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AvroStoreBuilderReducer.java
  24. +114 −0 ...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AvroStoreBuilderReducerPerBucket.java
  25. +71 −18 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilder.java
  26. +18 −237 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java
  27. +17 −248 ...hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducerPerBucket.java
  28. +16 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderUtils.java
  29. +16 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java
  30. +16 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HdfsDataFileChunk.java
  31. +36 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/IdentityJsonMapper.java
  32. +38 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/IdentityJsonReducer.java
  33. +92 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/JobState.java
  34. +89 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/VoldemortStoreBuilderMapper.java
  35. +284 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/AbstractHadoopJob.java
  36. +132 −0 ...oop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/AbstractVoldemortBatchCopyJob.java
  37. +75 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/Job.java
  38. +29 −0 ...hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/StoreBuilderTransformation.java
  39. +27 −0 ...hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/UndefinedPropertyException.java
  40. +421 −0 ...rib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortBatchIndexJob.java
  41. +886 −0 ...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortBuildAndPushJob.java
  42. +850 −0 ...tore-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortMultiStoreBuildAndPushJob.java
  43. +132 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortRollbackJob.java
  44. +469 −0 ...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortStoreBuilderJob.java
  45. +216 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortSwapJob.java
  46. +88 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortSwapperUtils.java
  47. +92 −0 ...rib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonConfigurable.java
  48. +115 −0 ...-store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonDeserializerComparator.java
  49. +75 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonMapper.java
  50. +60 −0 .../hadoop-store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonOutputCollector.java
  51. +97 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonReducer.java
  52. +126 −0 ...store-builder/src/java/voldemort/store/readonly/mr/serialization/JsonSequenceFileInputFormat.java
  53. +109 −0 ...tore-builder/src/java/voldemort/store/readonly/mr/serialization/JsonSequenceFileOutputFormat.java
  54. +121 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/AvroUtils.java
  55. +203 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/EmailMessage.java
  56. +1,001 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/HadoopUtils.java
  57. +65 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/JsonSchema.java
  58. +56 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/KeyValuePartitioner.java
  59. +153 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/MapperKeyValueWriter.java
  60. +138 −0 contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/utils/VoldemortUtils.java
  61. +10 −3 contrib/krati/src/java/voldemort/store/krati/KratiStorageConfiguration.java
  62. +1 −1 contrib/krati/src/java/voldemort/store/krati/KratiStorageEngine.java
  63. BIN lib/azkaban-common-0.05.jar
  64. BIN lib/joda-time-1.6.jar
  65. BIN lib/mail-1.4.1.jar
  66. +109 −1 release_notes.txt
  67. +3 −2 src/java/log4j.properties
  68. +534 −182 src/java/voldemort/VoldemortAdminTool.java
  69. +29 −14 src/java/voldemort/VoldemortClientShell.java
  70. +150 −27 src/java/voldemort/client/AbstractStoreClientFactory.java
  71. +13 −12 src/java/voldemort/client/CachingStoreClientFactory.java
  72. +262 −1 src/java/voldemort/client/ClientConfig.java
  73. +244 −0 src/java/voldemort/client/ClientInfo.java
  74. +11 −9 src/java/voldemort/client/DefaultStoreClient.java
  75. +3 −4 src/java/voldemort/client/HttpStoreClientFactory.java
  76. +26 −0 src/java/voldemort/client/LazyStoreClient.java
  77. +0 −1 src/java/voldemort/client/MockStoreClientFactory.java
  78. +23 −13 src/java/voldemort/client/SocketStoreClientFactory.java
  79. +0 −3 src/java/voldemort/client/StoreClientFactory.java
  80. +220 −0 src/java/voldemort/client/SystemStore.java
  81. +65 −0 src/java/voldemort/client/SystemStoreRepository.java
  82. +66 −0 src/java/voldemort/client/TimeoutConfig.java
  83. +276 −0 src/java/voldemort/client/ZenStoreClient.java
  84. +370 −29 src/java/voldemort/client/protocol/admin/AdminClient.java
  85. +2 −2 src/java/voldemort/client/protocol/admin/SocketPool.java
  86. +809 −69 src/java/voldemort/client/protocol/pb/VAdminProto.java
  87. +1 −1 src/java/voldemort/client/protocol/vold/VoldemortNativeClientRequestFormat.java
  88. +3 −0 src/java/voldemort/client/rebalance/RebalanceController.java
  89. +204 −0 src/java/voldemort/client/scheduler/AsyncMetadataVersionManager.java
  90. +95 −0 src/java/voldemort/client/scheduler/ClientRegistryRefresher.java
  91. +6 −0 src/java/voldemort/cluster/Node.java
  92. +45 −16 src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
  93. +1 −1 src/java/voldemort/cluster/failuredetector/AsyncRecoveryFailureDetector.java
  94. +2 −1 src/java/voldemort/cluster/failuredetector/BannagePeriodFailureDetector.java
  95. +4 −0 src/java/voldemort/cluster/failuredetector/BasicStoreVerifier.java
  96. +6 −0 src/java/voldemort/cluster/failuredetector/ClientStoreVerifier.java
  97. +36 −2 src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java
  98. +4 −0 src/java/voldemort/cluster/failuredetector/ServerStoreVerifier.java
  99. +5 −0 src/java/voldemort/cluster/failuredetector/StoreVerifier.java
  100. +1 −1 src/java/voldemort/cluster/failuredetector/ThresholdFailureDetector.java
  101. +53 −0 src/java/voldemort/common/OpTimeMap.java
  102. +1 −1 src/java/voldemort/{serialization → common}/VoldemortOpCode.java
  103. +1 −1 src/java/voldemort/{server → common/service}/AbstractService.java
  104. +19 −4 src/java/voldemort/{server/scheduler → common/service}/SchedulerService.java
  105. +1 −1 src/java/voldemort/{server → common/service}/ServiceType.java
  106. +2 −1 src/java/voldemort/{server → common/service}/VoldemortService.java
  107. +42 −0 src/java/voldemort/routing/RouteToAllLocalPrefStrategy.java
  108. +2 −0 src/java/voldemort/routing/RoutingStrategyFactory.java
  109. +1 −0 src/java/voldemort/routing/RoutingStrategyType.java
  110. +19 −1 src/java/voldemort/serialization/DefaultSerializerFactory.java
  111. +1 −0 src/java/voldemort/serialization/VoldemortOperation.java
  112. +171 −0 src/java/voldemort/serialization/avro/versioned/AvroVersionedGenericSerializer.java
  113. +874 −0 src/java/voldemort/serialization/avro/versioned/SchemaEvolutionValidator.java
  114. +3 −0 src/java/voldemort/server/AbstractSocketService.java
  115. +114 −3 src/java/voldemort/server/VoldemortConfig.java
  116. +19 −5 src/java/voldemort/server/VoldemortServer.java
  117. +3 −3 src/java/voldemort/server/gossip/GossipService.java
  118. +2 −2 src/java/voldemort/server/http/HttpService.java
  119. +1 −1 src/java/voldemort/server/http/StoreServlet.java
  120. +1 −1 src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
  121. +1 −1 src/java/voldemort/server/http/gui/StatusServlet.java
  122. +3 −12 src/java/voldemort/server/jmx/JmxService.java
  123. +47 −3 src/java/voldemort/server/niosocket/AsyncRequestHandler.java
  124. +26 −2 src/java/voldemort/server/niosocket/NioSelectorManager.java
  125. +26 −3 src/java/voldemort/server/niosocket/NioSocketService.java
  126. +1 −0 src/java/voldemort/server/protocol/AbstractRequestHandler.java
  127. +132 −54 src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
  128. +3 −3 src/java/voldemort/server/protocol/admin/AsyncOperationService.java
  129. +12 −1 src/java/voldemort/server/protocol/admin/FetchStreamRequestHandler.java
  130. +123 −1 src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
  131. +1 −1 src/java/voldemort/server/rebalance/Rebalancer.java
  132. +3 −3 src/java/voldemort/server/rebalance/RebalancerService.java
  133. +69 −34 src/java/voldemort/server/rebalance/async/DonorBasedRebalanceAsyncOperation.java
  134. +58 −63 src/java/voldemort/server/rebalance/async/DonorBasedRebalancePusherSlave.java
  135. +25 −8 src/java/voldemort/server/scheduler/DataCleanupJob.java
  136. +5 −5 src/java/voldemort/server/scheduler/slop/BlockingSlopPusherJob.java
  137. +4 −4 src/java/voldemort/server/scheduler/slop/StreamingSlopPusherJob.java
  138. +1 −1 src/java/voldemort/server/socket/SocketService.java
  139. +13 −13 src/java/voldemort/server/storage/RepairJob.java
  140. +88 −0 src/java/voldemort/server/storage/ScanPermitWrapper.java
  141. +330 −21 src/java/voldemort/server/storage/StorageService.java
  142. +9 −2 src/java/voldemort/store/StorageConfiguration.java
  143. +43 −11 src/java/voldemort/store/StoreDefinition.java
  144. +48 −24 src/java/voldemort/store/StoreDefinitionBuilder.java
  145. +15 −3 src/java/voldemort/store/bdb/BdbRuntimeConfig.java
  146. +150 −23 src/java/voldemort/store/bdb/BdbStorageConfiguration.java
  147. +81 −2 src/java/voldemort/store/bdb/BdbStorageEngine.java
  148. +131 −35 src/java/voldemort/store/bdb/stats/BdbEnvironmentStats.java
  149. +70 −0 src/java/voldemort/store/bdb/stats/SpaceUtilizationStats.java
  150. +55 −0 src/java/voldemort/store/configuration/FileBackedCachingStorageConfiguration.java
  151. +336 −0 src/java/voldemort/store/configuration/FileBackedCachingStorageEngine.java
  152. +2 −3 src/java/voldemort/store/logging/LoggingStore.java
  153. +8 −2 src/java/voldemort/store/memory/CacheStorageConfiguration.java
  154. +8 −2 src/java/voldemort/store/memory/InMemoryStorageConfiguration.java
  155. +51 −5 src/java/voldemort/store/metadata/MetadataStore.java
  156. +7 −2 src/java/voldemort/store/mysql/MysqlStorageConfiguration.java
  157. +2 −2 src/java/voldemort/store/nonblockingstore/ThreadPoolBasedNonblockingStoreImpl.java
  158. +11 −4 src/java/voldemort/store/readonly/ReadOnlyStorageConfiguration.java
  159. +2 −2 src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java
  160. +14 −0 src/java/voldemort/store/routed/PipelineData.java
  161. +110 −0 src/java/voldemort/store/routed/PipelineRoutedStats.java
  162. +334 −42 src/java/voldemort/store/routed/PipelineRoutedStore.java
  163. +4 −3 src/java/voldemort/store/routed/RoutedStore.java
  164. +33 −7 src/java/voldemort/store/routed/RoutedStoreFactory.java
  165. +24 −9 src/java/voldemort/store/routed/ThreadPoolRoutedStore.java
  166. +21 −4 src/java/voldemort/store/routed/action/AbstractReadRepair.java
  167. +147 −0 src/java/voldemort/store/routed/action/ConfigureNodesByZone.java
  168. +87 −0 src/java/voldemort/store/routed/action/ConfigureNodesDefault.java
  169. +91 −0 src/java/voldemort/store/routed/action/ConfigureNodesLocalHost.java
  170. +88 −0 src/java/voldemort/store/routed/action/ConfigureNodesLocalHostByZone.java
  171. +4 −3 src/java/voldemort/store/routed/action/PerformParallelDeleteRequests.java
  172. +3 −1 src/java/voldemort/store/routed/action/PerformParallelGetAllRequests.java
  173. +21 −17 src/java/voldemort/store/routed/action/PerformParallelPutRequests.java
  174. +17 −0 src/java/voldemort/store/routed/action/PerformParallelRequests.java
  175. +49 −18 src/java/voldemort/store/routed/action/PerformSerialGetAllRequests.java
  176. +37 −5 src/java/voldemort/store/routed/action/PerformSerialPutRequests.java
  177. +35 −1 src/java/voldemort/store/routed/action/PerformSerialRequests.java
  178. +32 −11 src/java/voldemort/store/slop/HintedHandoff.java
  179. +87 −117 src/java/voldemort/store/socket/SocketStore.java
  180. +31 −12 src/java/voldemort/store/socket/clientrequest/ClientRequestExecutor.java
  181. +14 −5 src/java/voldemort/store/socket/clientrequest/ClientRequestExecutorFactory.java
  182. +308 −66 src/java/voldemort/store/socket/clientrequest/ClientRequestExecutorPool.java
  183. +375 −0 src/java/voldemort/store/stats/ClientSocketStats.java
  184. +152 −0 src/java/voldemort/store/stats/ClientSocketStatsJmx.java
  185. +22 −19 src/java/voldemort/store/stats/Histogram.java
  186. +93 −31 src/java/voldemort/store/stats/RequestCounter.java
  187. +31 −16 src/java/voldemort/store/stats/StoreStats.java
  188. +21 −13 src/java/voldemort/store/stats/StoreStatsJmx.java
  189. +93 −0 src/java/voldemort/store/system/SystemStoreConstants.java
  190. +6 −1 src/java/voldemort/store/views/ViewStorageConfiguration.java
  191. +14 −0 src/java/voldemort/utils/ByteArray.java
  192. +3 −0 src/java/voldemort/utils/ByteUtils.java
  193. +84 −0 src/java/voldemort/utils/JNAUtils.java
  194. +13 −2 src/java/voldemort/utils/JmxUtils.java
  195. +47 −0 src/java/voldemort/utils/ManifestFileReader.java
  196. +88 −0 src/java/voldemort/utils/MetadataVersionStoreUtils.java
  197. +4 −0 src/java/voldemort/utils/Props.java
  198. +17 −5 src/java/voldemort/utils/RebalanceUtils.java
  199. +2 −1 src/java/voldemort/utils/Time.java
  200. +56 −0 src/java/voldemort/utils/pool/AsyncResourceRequest.java
  201. +288 −138 src/java/voldemort/utils/pool/KeyedResourcePool.java
  202. +364 −0 src/java/voldemort/utils/pool/QueuedKeyedResourcePool.java
  203. +6 −3 src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java
  204. +20 −1 src/java/voldemort/xml/StoreDefinitionsMapper.java
  205. +3 −0 src/java/voldemort/xml/stores.xsd
  206. +11 −0 src/proto/voldemort-admin.proto
  207. +126 −14 test/common/voldemort/ServerTestUtils.java
  208. +0 −1 test/common/voldemort/StaticStoreClientFactory.java
  209. +65 −0 test/common/voldemort/TestUtils.java
  210. +5 −0 test/common/voldemort/VoldemortTestConstants.java
  211. +47 −0 test/common/voldemort/config/stores.xml
  212. +39 −0 test/common/voldemort/config/two-stores.xml
  213. +2 −2 test/integration/voldemort/CatBdbStore.java
  214. +2 −2 test/integration/voldemort/cluster/failuredetector/FailureDetectorPerformanceTest.java
  215. +1 −1 test/integration/voldemort/cluster/failuredetector/FlappingTest.java
  216. +1 −1 test/integration/voldemort/cluster/failuredetector/TimedUnavailabilityTest.java
  217. +338 −0 test/integration/voldemort/nonblocking/E2ENonblockingCheckoutTest.java
  218. +2 −1 test/integration/voldemort/performance/BdbGrowth.java
  219. +2 −1 test/integration/voldemort/performance/CacheStorageEnginePerformanceTest.java
  220. +19 −20 test/integration/voldemort/performance/ClientConnectionStressTest.java
  221. +25 −34 test/integration/voldemort/performance/RoutedStoreParallelismTest.java
  222. +1 −1 test/integration/voldemort/performance/StorageEnginePerformanceTest.java
  223. +29 −5 test/integration/voldemort/performance/benchmark/Benchmark.java
  224. +9 −2 test/integration/voldemort/store/noop/NoopStorageConfiguration.java
  225. +8 −2 test/integration/voldemort/store/pausable/PausableStorageConfiguration.java
  226. +63 −0 test/integration/voldemort/store/slow/SlowStorageConfiguration.java
  227. +149 −0 test/integration/voldemort/store/slow/SlowStorageEngine.java
  228. +121 −0 test/long/voldemort/client/rebalance/RebalanceLongTest.java
  229. +1 −1 test/unit/voldemort/client/AbstractStoreClientFactoryTest.java
  230. +414 −34 test/unit/voldemort/client/AdminServiceBasicTest.java
  231. +314 −0 test/unit/voldemort/client/ClientJmxTest.java
  232. +817 −0 test/unit/voldemort/client/ClientRegistryTest.java
  233. +220 −0 test/unit/voldemort/client/EndToEndRebootstrapTest.java
  234. +11 −8 test/unit/voldemort/client/LazyStoreClientTest.java
  235. +213 −0 test/unit/voldemort/client/SocketStoreClientFactoryMbeanTest.java
  236. +128 −25 test/unit/voldemort/client/rebalance/AbstractRebalanceTest.java
  237. +119 −104 test/unit/voldemort/client/rebalance/AdminRebalanceTest.java
  238. +19 −1 test/unit/voldemort/client/rebalance/RebalanceTest.java
  239. +2 −2 test/unit/voldemort/cluster/TestCluster.java
  240. +2 −2 test/unit/voldemort/cluster/failuredetector/BannagePeriodFailureDetectorTest.java
  241. +17 −22 test/unit/voldemort/cluster/failuredetector/ServerStoreVerifierTest.java
  242. +8 −3 test/unit/voldemort/cluster/failuredetector/ThresholdFailureDetectorTest.java
  243. +3 −3 test/unit/voldemort/scheduled/BlockingSlopPusherTest.java
  244. +120 −13 test/unit/voldemort/scheduled/DataCleanupJobTest.java
  245. +53 −30 test/unit/voldemort/scheduled/StreamingSlopPusherTest.java
  246. +95 −0 test/unit/voldemort/serialization/avro/versioned/AvroBackwardsCompatibilityTest.java
  247. +27 −26 test/unit/voldemort/server/EndToEndTest.java
  248. +2 −0 test/unit/voldemort/server/ServiceTest.java
  249. +86 −34 test/unit/voldemort/server/gossip/GossiperTest.java
  250. +1 −1 test/unit/voldemort/server/protocol/admin/AsyncOperationTest.java
  251. +15 −9 test/unit/voldemort/server/socket/ClientRequestExecutorPoolTest.java
  252. +116 −0 test/unit/voldemort/server/socket/NioStatsJmxTest.java
  253. +56 −1 test/unit/voldemort/server/storage/StorageServiceTest.java
  254. +11 −14 test/unit/voldemort/store/AbstractStoreTest.java
  255. +337 −0 test/unit/voldemort/store/bdb/BdbCachePartitioningTest.java
  256. +15 −9 test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java
  257. +2 −1 test/unit/voldemort/store/bdb/BdbStorageEngineTest.java
  258. +169 −0 test/unit/voldemort/store/configuration/FileBackedCachingStorageEngineTest.java
  259. +1 −1 test/unit/voldemort/store/memory/CacheStorageEngineTest.java
  260. +289 −0 test/unit/voldemort/store/memory/SlowStorageEngineTest.java
  261. +49 −37 test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java
  262. +33 −19 test/unit/voldemort/store/rebalancing/RebootstrappingStoreTest.java
  263. +290 −0 test/unit/voldemort/store/routed/GetallNodeReachTest.java
  264. +8 −5 test/unit/voldemort/store/routed/HintedHandoffTest.java
  265. +10 −7 test/unit/voldemort/store/routed/ReadRepairerTest.java
  266. +179 −43 test/unit/voldemort/store/routed/RoutedStoreTest.java
  267. +2 −2 test/unit/voldemort/store/routed/action/AbstractActionTest.java
  268. +105 −0 test/unit/voldemort/store/routed/action/ConfigureNodesLocalHostTest.java
  269. +391 −0 test/unit/voldemort/store/stats/ClientSocketStatsTest.java
  270. +28 −0 test/unit/voldemort/store/stats/RequestCounterTest.java
  271. +268 −0 test/unit/voldemort/store/system/AsyncMetadataVersionManagerTest.java
  272. +155 −0 test/unit/voldemort/store/system/SystemStoreTest.java
  273. +185 −0 test/unit/voldemort/utils/ServerTestUtilsTest.java
  274. +286 −32 test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java
  275. +483 −0 test/unit/voldemort/utils/pool/QueuedKeyedResourcePoolTest.java
  276. +142 −0 test/unit/voldemort/versioning/ChainedInconsistencyResolverTest.java
View
@@ -51,8 +51,11 @@
<classpathentry kind="lib" path="lib/libthrift-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/compress-lzf-0.9.1.jar"/>
<classpathentry kind="lib" path="lib/snappy-0.2.jar"/>
- <classpathentry kind="lib" path="lib/httpclient-4.1.2.jar" />
- <classpathentry kind="lib" path="lib/httpcore-4.1.2.jar" />
+ <classpathentry kind="lib" path="lib/httpclient-4.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/httpcore-4.1.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="lib/joda-time-1.6.jar"/>
+ <classpathentry kind="lib" path="lib/mail-1.4.1.jar"/>
+ <classpathentry kind="lib" path="lib/azkaban-common-0.05.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
View
@@ -13,3 +13,4 @@ server.state
.version
.temp
.idea
+data/
@@ -1,4 +1,4 @@
-#Fri Dec 30 14:37:10 PST 2011
+#Thu Aug 30 10:43:57 PDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -77,7 +77,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=82
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=82
View
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.2-b06 (Sun Microsystems Inc.)
+Implementation-Title: Voldemort
+Implementation-Version: 1.0.0
+Implementation-Vendor: LinkedIn
+
View
@@ -1,42 +1,90 @@
+#!/usr/bin/python
+
import sys
import random
+import argparse
+
+# Get a random seed
+rseed = int(random.randint(00000000001,99999999999))
+
+# Setup and argument parser
+parser = argparse.ArgumentParser(description='Build a voldemort cluster.xml.')
+# Add supported arguments
+parser.add_argument('-N', '--name', type=str, default='voldemort', dest='name',
+ help='the name you want to give the cluster')
+parser.add_argument('-n', '--nodes', type=int, default=2, dest='nodes',
+ help='the number of nodes in the cluster')
+parser.add_argument('-p', '--partitions', type=int, default=300,
+ dest='partitions', help='number of partitions per node')
+parser.add_argument('-s', '--socket-port', type=int, default=6666,
+ dest='sock_port', help='socket port number')
+parser.add_argument('-a', '--admin-port', type=int, default=6667,
+ dest='admin_port', help='admin port number')
+parser.add_argument('-H', '--http-port', type=int, default=6665,
+ dest='http_port', help='http port number')
+genType = parser.add_mutually_exclusive_group()
+genType.add_argument('-S', '--seed', type=int, default=rseed, dest='seed',
+ help='seed for randomizing partition distribution')
+genType.add_argument('-l', '--loops', type=int, default=1000, dest='loops',
+ help='loop n times, using a different random seed every \
+ time (Note: not currently supported)')
+parser.add_argument('-z', '--zones', type=int, dest='zones',
+ help='if using zones, the number of zones you will have\
+ (Note: you must add your own <zone> fields \
+ manually)')
+
+# Parse arguments
+args = parser.parse_args()
+
+# Check args
+if args.zones:
+ zones = args.zones
+ if (args.nodes % zones) != 0:
+ print "Number of nodes must be evenly divisible by number of zones"
+ sys.exit(1)
+
+# Store arguments
+nodes = args.nodes
+partitions = args.partitions
+name = args.name
+http_port = args.http_port
+sock_port = args.sock_port
+admin_port = args.admin_port
+seed = args.seed
+
+# Generate the full list of partition IDs
+part_ids = range(nodes * partitions)
+# Generate full list of zone IDs
+if args.zones:
+ zone_ids = range(zones)
+ zone_id = 0
+
+# Shuffle up the partitions
+random.seed(seed)
+random.shuffle(part_ids)
+
+# Printing cluster.xml
+print "<!-- Partition distribution generated using seed [%d] -->" % seed
+print "<cluster>"
+print " <name>%s</name>" % name
+
+for i in xrange(nodes):
+ node_partitions = ", ".join(str(p) for p in sorted(part_ids[i*partitions:(i+1)*partitions]))
+
+ print " <server>"
+ print " <id>%d</id>" % i
+ print " <host>host%d</host>" % i
+ print " <http-port>%d</http-port>" % http_port
+ print " <socket-port>%d</socket-port>" % sock_port
+ print " <admin-port>%d</admin-port>" % admin_port
+ print " <partitions>%s</partitions>" % node_partitions
+ # If zones are being used, assign a zone-id
+ if args.zones:
+ print " <zone-id>%d</zone-id>" % zone_id
+ if zone_id == (zones - 1):
+ zone_id = 0
+ else:
+ zone_id += 1
+ print " </server>"
-if len(sys.argv) != 3:
- print >> sys.stderr, "USAGE: python generate_partitions.py <nodes_file> <partitions_per_node>"
- sys.exit()
-
-FORMAT_WIDTH = 10
-
-nodes = 0
-for line in open(sys.argv[1],'r'):
- nodes+=1
-
-partitions = int(sys.argv[2])
-
-ids = range(nodes * partitions)
-
-# use known seed so this is repeatable
-random.seed(92873498274)
-random.shuffle(ids)
-
-print '<cluster>'
-print '<name>prodcluster</name>'
-id = 0
-for host in open(sys.argv[1],'r'):
- print '<server>'
- print " <id>%d</id>" % id
- print " <host>%s</host>" % host.strip()
- print ' <http-port>8081</http-port>'
- print ' <socket-port>6666</socket-port>'
- print ' <partitions>',
- node_ids = sorted(ids[id*partitions:(id+1)*partitions])
- for j in xrange(len(node_ids)):
- print str(node_ids[j]) + ',',
- if j % FORMAT_WIDTH == FORMAT_WIDTH - 1:
- print ' ',
- print ' </partitions>'
- print '</server>'
- id += 1
-print '</cluster>'
-
-
+print "</cluster>"
View
@@ -0,0 +1,93 @@
+#!/bin/bash -e
+
+# Copyright 2012 LinkedIn, Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+usage() {
+ echo
+ echo "Usage:"
+ echo "bin/repeat-junit-test.sh test_file num_times"
+ echo
+ cat <<EOF
+Invoke bin/repeat-junit-test.sh from the root of a Voldemort
+checkout. bin/repeat-junit-test.sh invokes 'ant junit-test' num_times
+for test test_name.
+
+The argument num_times must be an integer. The argument test_name must
+be a class name suitable for 'ant junit-test'. I.e., a fully qualified
+java class name. Remember, the class name does not include the .java
+extension. An example test_name is voldemort.utils.ServerTestUtilsTest.
+
+The pretty html junit output that ends up in dist/junit-single-report
+on a single invocation of 'ant junit-test' is collected in a temp
+directory. This circumvents the normal behavior of ant in which
+dist/junit-single-report is overwritten with each invocation of 'ant
+junit-test'.
+
+bin/repeat-junit-test.sh is useful to run after adding a new test
+case, or when trying to reproduce intermittent failures of a specific
+test.
+EOF
+}
+
+if [ $# != 2 ]; then
+ echo "ERROR: Incorrect number of arguments: $# provided, 2 needed." >&2
+ usage
+ exit 1
+fi
+
+TESTNAME=$1
+# Hackish test that makes sure some java file exists for given
+# testname. No guarantee that junit-test can run the specified test,
+# but at least protects against typos.
+FILENAME=`echo $TESTNAME | sed 's/.*\.//g'`.java
+FINDFILE=`find . -name "$FILENAME" | wc -l`
+if [[ $FINDFILE == 0 ]]
+then
+ echo "ERROR: Did not find an appropriate file (with name $FILENAME), given test name $TESTNAME." >&2
+ usage
+ exit 1
+fi
+
+
+NUMTIMES=$2
+if [[ ! $NUMTIMES == +([0-9]) ]]
+then
+ echo "ERROR: argument num_times is not an integer: $NUMTIMES." >&2
+ usage
+ exit 1
+fi
+
+TMPDIR=`mktemp -d -p '/tmp/'`
+
+for ((i=1;i<=$NUMTIMES;i++)); do
+ echo
+ echo "STARTING ITERATION $i"
+ echo
+
+ # Run junit-test and capture stdout to .out and stderr to .err
+ junitiout="$TMPDIR/TEST-$TESTNAME-$i.out"
+ junitierr="$TMPDIR/TEST-$TESTNAME-$i.err"
+ ant junit-test -Dtest.name=$TESTNAME > >(tee $junitiout) 2> >(tee $junitierr >&2)
+
+ # Collect results
+ junitidir="$TMPDIR/junit-single-report-$TESTNAME-$i"
+ echo
+ echo "COLLECTING RESULTS OF ITERATION $i IN $junitidir"
+ cp -r dist/junit-single-reports $junitidir
+ mv $junitiout $junitidir
+ mv $junitierr $junitidir
+done
+
+
View
@@ -0,0 +1,75 @@
+#!/bin/bash -e
+
+# Copyright 2012 LinkedIn, Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+usage() {
+ echo
+ echo "Usage:"
+ echo "bin/repeat-junit.sh num_times"
+ echo
+ cat <<EOF
+Invoke bin/repeat-junit.sh from the root of a Voldemort
+checkout. bin/repeat-junit.sh invokes 'ant junit' num_times.
+
+The argument num_times must be an integer.
+
+The pretty html junit output that ends up in dist/junit-reports on a
+single invocation of 'ant junit' is collected in a temp
+directory. This circumvents the normal behavior of ant in which
+dist/junit-reports is overwritten with each invocation of 'ant
+junit'.
+
+bin/repeat-junit.sh is useful to run after making some substantial
+changes, or when trying to track down intermittent failures (that
+occur more on your local box then on a Hudson test machine...).
+EOF
+}
+
+if [ $# != 1 ]; then
+ echo "ERROR: Incorrect number of arguments: $# provided, 1 needed." >&2
+ usage
+ exit 1
+fi
+
+NUMTIMES=$1
+if [[ ! $NUMTIMES == +([0-9]) ]]
+then
+ echo "ERROR: argument num_times is not an integer: $NUMTIMES." >&2
+ usage
+ exit 1
+fi
+
+TMPDIR=`mktemp -d -p '/tmp/'`
+
+for ((i=1;i<=$NUMTIMES;i++)); do
+ echo
+ echo "STARTING ITERATION $i"
+ echo
+
+ # Run junit and capture stdout to .out and stderr to .err
+ junitiout="$TMPDIR/junit-$i.out"
+ junitierr="$TMPDIR/junit-$i.err"
+ ant junit > >(tee $junitiout) 2> >(tee $junitierr >&2)
+
+ # Collect results
+ junitidir="$TMPDIR/junit-reports-$i"
+ echo
+ echo "COLLECTING RESULTS OF ITERATION $i IN $junitidir"
+ cp -r dist/junit-reports $junitidir
+ mv $junitiout $junitidir
+ mv $junitierr $junitidir
+done
+
+
View
@@ -9,10 +9,15 @@ classes.dir=dist/classes
resources.dir=dist/resources
commontestsrc.dir=test/common
unittestsrc.dir=test/unit
+longtestsrc.dir=test/long
inttestsrc.dir=test/integration
testclasses.dir=dist/testclasses
testreport.dir=dist/junit-reports
testhtml.dir=dist/junit-reports/html
+singletestreport.dir=dist/junit-single-reports
+singletesthtml.dir=dist/junit-single-reports/html
+longtestreport.dir=dist/junit-long-reports
+longtesthtml.dir=dist/junit-long-reports/html
## Contrib
contrib.root.dir=contrib
@@ -34,4 +39,4 @@ tomcat.manager.password=tomcat
tomcat.context=/voldemort
## Release
-curr.release=0.90.1
+curr.release=1.0.0
Oops, something went wrong.

0 comments on commit ed6ddd3

Please sign in to comment.