Skip to content

Commit 3bd5fa0

Browse files
committed
fix e2e tests
1 parent a73e5e1 commit 3bd5fa0

File tree

8 files changed

+19
-21
lines changed

8 files changed

+19
-21
lines changed

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/DaVinciClientP2PBlobTransferTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static com.linkedin.venice.ConfigKeys.DAVINCI_P2P_BLOB_TRANSFER_SERVER_PORT;
2727
import static com.linkedin.venice.ConfigKeys.DAVINCI_PUSH_STATUS_CHECK_INTERVAL_IN_MS;
2828
import static com.linkedin.venice.ConfigKeys.DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS;
29+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
2930
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
3031
import static com.linkedin.venice.ConfigKeys.PUSH_STATUS_STORE_ENABLED;
3132
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_CHECKSUM_VERIFICATION_ENABLED;
@@ -97,6 +98,7 @@ public void setUp() {
9798
Properties clusterConfig = new Properties();
9899
clusterConfig.put(PUSH_STATUS_STORE_ENABLED, true);
99100
clusterConfig.put(DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS, 3);
101+
clusterConfig.put(MAX_READ_CAPACITY, 20000000);
100102
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
101103
.numberOfServers(2)
102104
.numberOfRouters(1)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/DaVinciClientRecordTransformerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static com.linkedin.venice.ConfigKeys.DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS;
2929
import static com.linkedin.venice.ConfigKeys.DA_VINCI_CURRENT_VERSION_BOOTSTRAPPING_SPEEDUP_ENABLED;
3030
import static com.linkedin.venice.ConfigKeys.DA_VINCI_SUBSCRIBE_ON_DISK_PARTITIONS_AUTOMATICALLY;
31+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
3132
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
3233
import static com.linkedin.venice.ConfigKeys.PUSH_STATUS_STORE_ENABLED;
3334
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_CHECKSUM_VERIFICATION_ENABLED;
@@ -108,6 +109,7 @@ public void setUp() {
108109
Properties clusterConfig = new Properties();
109110
clusterConfig.put(PUSH_STATUS_STORE_ENABLED, true);
110111
clusterConfig.put(DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS, 3);
112+
clusterConfig.put(MAX_READ_CAPACITY, 20000000);
111113
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
112114
.numberOfServers(2)
113115
.numberOfRouters(1)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/TestHybrid.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_INTERVAL_MS;
99
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_SCHEDULING_ENABLED;
1010
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_THRESHOLD_MS;
11+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
1112
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
1213
import static com.linkedin.venice.ConfigKeys.REPUSH_ORCHESTRATOR_CLASS_NAME;
1314
import static com.linkedin.venice.ConfigKeys.SERVER_CONSUMER_POOL_ALLOCATION_STRATEGY;
@@ -1706,6 +1707,7 @@ private static VeniceClusterWrapper setUpCluster(boolean enablePartitionWiseShar
17061707
extraProperties.setProperty(LOG_COMPACTION_INTERVAL_MS, String.valueOf(TEST_LOG_COMPACTION_INTERVAL_MS));
17071708
extraProperties
17081709
.setProperty(LOG_COMPACTION_THRESHOLD_MS, String.valueOf(TEST_TIME_SINCE_LAST_LOG_COMPACTION_THRESHOLD_MS));
1710+
extraProperties.setProperty(MAX_READ_CAPACITY, "20000000");
17091711
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
17101712
.numberOfServers(0)
17111713
.numberOfRouters(0)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/TestHybridQuota.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static com.linkedin.venice.ConfigKeys.HELIX_HYBRID_STORE_QUOTA_ENABLED;
44
import static com.linkedin.venice.ConfigKeys.HYBRID_QUOTA_ENFORCEMENT_ENABLED;
5+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
56
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
67
import static com.linkedin.venice.ConfigKeys.SERVER_CONSUMER_POOL_SIZE_PER_KAFKA_CLUSTER;
78
import static com.linkedin.venice.ConfigKeys.SSL_TO_KAFKA_LEGACY;
@@ -70,6 +71,7 @@ public class TestHybridQuota {
7071
public void setUp() {
7172
Properties extraProperties = new Properties();
7273
extraProperties.setProperty(PERSISTENCE_TYPE, PersistenceType.ROCKS_DB.name());
74+
extraProperties.put(MAX_READ_CAPACITY, 20000000);
7375

7476
// N.B.: RF 2 with 3 servers is important, in order to test both the leader and follower code paths
7577
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/TestPushJobWithNativeReplication.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,7 @@
22

33
import static com.linkedin.davinci.store.rocksdb.RocksDBServerConfig.ROCKSDB_BLOCK_CACHE_SIZE_IN_BYTES;
44
import static com.linkedin.davinci.store.rocksdb.RocksDBServerConfig.ROCKSDB_PLAIN_TABLE_FORMAT_ENABLED;
5-
import static com.linkedin.venice.ConfigKeys.CLIENT_SYSTEM_STORE_REPOSITORY_REFRESH_INTERVAL_SECONDS;
6-
import static com.linkedin.venice.ConfigKeys.CLIENT_USE_SYSTEM_STORE_REPOSITORY;
7-
import static com.linkedin.venice.ConfigKeys.CONTROLLER_DEFERRED_VERSION_SWAP_SERVICE_ENABLED;
8-
import static com.linkedin.venice.ConfigKeys.CONTROLLER_DEFERRED_VERSION_SWAP_SLEEP_MS;
9-
import static com.linkedin.venice.ConfigKeys.DATA_BASE_PATH;
10-
import static com.linkedin.venice.ConfigKeys.DEFAULT_MAX_NUMBER_OF_PARTITIONS;
11-
import static com.linkedin.venice.ConfigKeys.EMERGENCY_SOURCE_REGION;
12-
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
13-
import static com.linkedin.venice.ConfigKeys.PUSH_JOB_STATUS_STORE_CLUSTER_NAME;
14-
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_CHECKSUM_VERIFICATION_ENABLED;
15-
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_SYNC_BYTES_INTERNAL_FOR_DEFERRED_WRITE_MODE;
5+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
166
import static com.linkedin.venice.integration.utils.DaVinciTestContext.getCachingDaVinciClientFactory;
177
import static com.linkedin.venice.meta.PersistenceType.ROCKS_DB;
188
import static com.linkedin.venice.utils.IntegrationTestPushUtils.createStoreForJob;
@@ -172,6 +162,7 @@ public void setUp() {
172162
controllerProps.put(EMERGENCY_SOURCE_REGION, "dc-0");
173163
controllerProps.put(CONTROLLER_DEFERRED_VERSION_SWAP_SERVICE_ENABLED, true);
174164
controllerProps.put(CONTROLLER_DEFERRED_VERSION_SWAP_SLEEP_MS, 100);
165+
controllerProps.put(MAX_READ_CAPACITY, 20000000);
175166

176167
VeniceMultiRegionClusterCreateOptions.Builder optionsBuilder =
177168
new VeniceMultiRegionClusterCreateOptions.Builder().numberOfRegions(NUMBER_OF_CHILD_DATACENTERS)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/TestStuckConsumerRepair.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static com.linkedin.davinci.store.rocksdb.RocksDBServerConfig.ROCKSDB_PLAIN_TABLE_FORMAT_ENABLED;
44
import static com.linkedin.venice.ConfigKeys.DEFAULT_MAX_NUMBER_OF_PARTITIONS;
5+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
56
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
67
import static com.linkedin.venice.ConfigKeys.SERVER_CONSUMER_POOL_SIZE_PER_KAFKA_CLUSTER;
78
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_CHECKSUM_VERIFICATION_ENABLED;
@@ -79,6 +80,7 @@ public void setUp() {
7980
private static VeniceClusterWrapper setUpCluster() {
8081
Properties extraProperties = new Properties();
8182
extraProperties.setProperty(DEFAULT_MAX_NUMBER_OF_PARTITIONS, "5");
83+
extraProperties.setProperty(MAX_READ_CAPACITY, "20000000");
8284
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
8385
.numberOfServers(0)
8486
.numberOfRouters(1)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/VersionSpecificDaVinciClientTest.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
package com.linkedin.venice.endToEnd;
22

33
import static com.linkedin.davinci.store.rocksdb.RocksDBServerConfig.ROCKSDB_BLOCK_CACHE_SIZE_IN_BYTES;
4-
import static com.linkedin.venice.ConfigKeys.CLIENT_SYSTEM_STORE_REPOSITORY_REFRESH_INTERVAL_SECONDS;
5-
import static com.linkedin.venice.ConfigKeys.CLIENT_USE_SYSTEM_STORE_REPOSITORY;
6-
import static com.linkedin.venice.ConfigKeys.DATA_BASE_PATH;
7-
import static com.linkedin.venice.ConfigKeys.DAVINCI_PUSH_STATUS_CHECK_INTERVAL_IN_MS;
8-
import static com.linkedin.venice.ConfigKeys.DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS;
9-
import static com.linkedin.venice.ConfigKeys.DA_VINCI_CURRENT_VERSION_BOOTSTRAPPING_SPEEDUP_ENABLED;
10-
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
11-
import static com.linkedin.venice.ConfigKeys.PUSH_STATUS_STORE_ENABLED;
12-
import static com.linkedin.venice.ConfigKeys.SERVER_DATABASE_CHECKSUM_VERIFICATION_ENABLED;
4+
import static com.linkedin.venice.ConfigKeys.*;
135
import static com.linkedin.venice.integration.utils.VeniceClusterWrapper.DEFAULT_KEY_SCHEMA;
146
import static com.linkedin.venice.meta.PersistenceType.ROCKS_DB;
157
import static com.linkedin.venice.utils.IntegrationTestPushUtils.createStoreForJob;
@@ -72,6 +64,7 @@ public void setUp() {
7264
Properties clusterConfig = new Properties();
7365
clusterConfig.put(PUSH_STATUS_STORE_ENABLED, true);
7466
clusterConfig.put(DAVINCI_PUSH_STATUS_SCAN_INTERVAL_IN_SECONDS, 3);
67+
clusterConfig.put(MAX_READ_CAPACITY, "20000000");
7568
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
7669
.numberOfServers(2)
7770
.numberOfRouters(1)

internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/hadoop/TestVenicePushJob.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.linkedin.venice.hadoop;
22

3+
import static com.linkedin.venice.ConfigKeys.MAX_READ_CAPACITY;
34
import static com.linkedin.venice.ConfigKeys.VENICE_PARTITIONERS;
45
import static com.linkedin.venice.hadoop.VenicePushJob.getLatestPathOfInputDirectory;
56
import static com.linkedin.venice.utils.IntegrationTestPushUtils.createStoreForJob;
@@ -151,7 +152,10 @@ protected static Schema writeSimpleAvroFileWithDifferentUserSchema(File parentDi
151152
@BeforeClass
152153
public void setUp() {
153154
Utils.thisIsLocalhost();
154-
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().sslToStorageNodes(true).build();
155+
Properties clusterConfig = new Properties();
156+
clusterConfig.put(MAX_READ_CAPACITY, "20000000");
157+
VeniceClusterCreateOptions options =
158+
new VeniceClusterCreateOptions.Builder().sslToStorageNodes(true).extraProperties(clusterConfig).build();
155159
veniceCluster = ServiceFactory.getVeniceCluster(options); // Now with SSL!
156160
controllerClient = new ControllerClient(veniceCluster.getClusterName(), veniceCluster.getRandomRouterURL());
157161
}

0 commit comments

Comments
 (0)