Skip to content

Commit bb8c1eb

Browse files
craig[bot]miraradeva
craig[bot]
and
miraradeva
committed
Merge #151551
151551: roachtest: tune max warehouses for some TPCC bench tests r=miraradeva a=miraradeva After increasing the max warehouses recently, some tests need another adjustment based on recent failures. Part of: #149599 Fixes: [#150080](#150080) Fixes: [#150315](#150315) Fixes: [#150316](#150316) Fixes: [#151191](#151191) Fixes: [#151195](#151195) Fixes: [#151196](#151196) Fixes: [#151197](#151197) Fixes: [#151288](#151288) Release note: None Co-authored-by: Mira Radeva <mira@cockroachlabs.com>
2 parents dd4cfcf + 696b32f commit bb8c1eb

File tree

1 file changed

+68
-68
lines changed

1 file changed

+68
-68
lines changed

‎pkg/cmd/roachtest/tests/tpcc.go‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,29 +1462,29 @@ func registerTPCC(r registry.Registry) {
14621462
Nodes: 3,
14631463
CPUs: 16,
14641464

1465-
LoadWarehousesGCE: 4700,
1466-
LoadWarehousesAWS: 4700,
1467-
LoadWarehousesAzure: 4700,
1468-
LoadWarehousesIBM: 4700,
1469-
EstimatedMaxGCE: 4300,
1470-
EstimatedMaxAWS: 4300,
1471-
EstimatedMaxAzure: 4300,
1472-
EstimatedMaxIBM: 4300,
1465+
LoadWarehousesGCE: 5000,
1466+
LoadWarehousesAWS: 5000,
1467+
LoadWarehousesAzure: 5000,
1468+
LoadWarehousesIBM: 5000,
1469+
EstimatedMaxGCE: 4500,
1470+
EstimatedMaxAWS: 4500,
1471+
EstimatedMaxAzure: 4500,
1472+
EstimatedMaxIBM: 4500,
14731473
Clouds: registry.AllClouds,
14741474
Suites: registry.Suites(registry.Nightly),
14751475
})
14761476
registerTPCCBenchSpec(r, tpccBenchSpec{
14771477
Nodes: 3,
14781478
CPUs: 16,
14791479

1480-
LoadWarehousesGCE: 4700,
1481-
LoadWarehousesAWS: 4700,
1482-
LoadWarehousesAzure: 4700,
1483-
LoadWarehousesIBM: 4700,
1484-
EstimatedMaxGCE: 4300,
1485-
EstimatedMaxAWS: 4300,
1486-
EstimatedMaxAzure: 4300,
1487-
EstimatedMaxIBM: 4300,
1480+
LoadWarehousesGCE: 5000,
1481+
LoadWarehousesAWS: 5000,
1482+
LoadWarehousesAzure: 5000,
1483+
LoadWarehousesIBM: 5000,
1484+
EstimatedMaxGCE: 4500,
1485+
EstimatedMaxAWS: 4500,
1486+
EstimatedMaxAzure: 4500,
1487+
EstimatedMaxIBM: 4500,
14881488
Clouds: registry.AllClouds,
14891489
Suites: registry.Suites(registry.Nightly),
14901490
SharedProcessMT: true,
@@ -1493,10 +1493,10 @@ func registerTPCC(r registry.Registry) {
14931493
Nodes: 12,
14941494
CPUs: 16,
14951495

1496-
LoadWarehousesGCE: 15000,
1497-
LoadWarehousesAWS: 15000,
1498-
LoadWarehousesAzure: 15000,
1499-
LoadWarehousesIBM: 15000,
1496+
LoadWarehousesGCE: 18000,
1497+
LoadWarehousesAWS: 18000,
1498+
LoadWarehousesAzure: 18000,
1499+
LoadWarehousesIBM: 18000,
15001500
EstimatedMaxGCE: 13000,
15011501
EstimatedMaxAWS: 13000,
15021502
EstimatedMaxAzure: 13000,
@@ -1547,14 +1547,14 @@ func registerTPCC(r registry.Registry) {
15471547
Chaos: true,
15481548
LoadConfig: singlePartitionedLoadgen,
15491549

1550-
LoadWarehousesGCE: 2600,
1551-
LoadWarehousesAWS: 2600,
1552-
LoadWarehousesAzure: 2600,
1553-
LoadWarehousesIBM: 2600,
1554-
EstimatedMaxGCE: 2300,
1555-
EstimatedMaxAWS: 2300,
1556-
EstimatedMaxAzure: 2300,
1557-
EstimatedMaxIBM: 2300,
1550+
LoadWarehousesGCE: 3000,
1551+
LoadWarehousesAWS: 3000,
1552+
LoadWarehousesAzure: 3000,
1553+
LoadWarehousesIBM: 3000,
1554+
EstimatedMaxGCE: 2500,
1555+
EstimatedMaxAWS: 2500,
1556+
EstimatedMaxAzure: 2500,
1557+
EstimatedMaxIBM: 2500,
15581558

15591559
Clouds: registry.OnlyGCE,
15601560
Suites: registry.Suites(registry.Nightly),
@@ -1583,14 +1583,14 @@ func registerTPCC(r registry.Registry) {
15831583
Nodes: 3,
15841584
CPUs: 16,
15851585

1586-
LoadWarehousesGCE: 4700,
1587-
LoadWarehousesAWS: 4700,
1588-
LoadWarehousesAzure: 4700,
1589-
LoadWarehousesIBM: 4700,
1590-
EstimatedMaxGCE: 4300,
1591-
EstimatedMaxAWS: 4300,
1592-
EstimatedMaxAzure: 4300,
1593-
EstimatedMaxIBM: 4300,
1586+
LoadWarehousesGCE: 5000,
1587+
LoadWarehousesAWS: 5000,
1588+
LoadWarehousesAzure: 5000,
1589+
LoadWarehousesIBM: 5000,
1590+
EstimatedMaxGCE: 4500,
1591+
EstimatedMaxAWS: 4500,
1592+
EstimatedMaxAzure: 4500,
1593+
EstimatedMaxIBM: 4500,
15941594
EncryptionEnabled: true,
15951595
Clouds: registry.AllClouds,
15961596
Suites: registry.Suites(registry.Nightly),
@@ -1599,10 +1599,10 @@ func registerTPCC(r registry.Registry) {
15991599
Nodes: 12,
16001600
CPUs: 16,
16011601

1602-
LoadWarehousesGCE: 15000,
1603-
LoadWarehousesAWS: 15000,
1604-
LoadWarehousesAzure: 15000,
1605-
LoadWarehousesIBM: 15000,
1602+
LoadWarehousesGCE: 18000,
1603+
LoadWarehousesAWS: 18000,
1604+
LoadWarehousesAzure: 18000,
1605+
LoadWarehousesIBM: 18000,
16061606
EstimatedMaxGCE: 13000,
16071607
EstimatedMaxAWS: 13000,
16081608
EstimatedMaxAzure: 13000,
@@ -1635,14 +1635,14 @@ func registerTPCC(r registry.Registry) {
16351635
Nodes: 3,
16361636
CPUs: 16,
16371637

1638-
LoadWarehousesGCE: 4700,
1639-
LoadWarehousesAWS: 4700,
1640-
LoadWarehousesAzure: 4700,
1641-
LoadWarehousesIBM: 4700,
1642-
EstimatedMaxGCE: 4300,
1643-
EstimatedMaxAWS: 4300,
1644-
EstimatedMaxAzure: 4300,
1645-
EstimatedMaxIBM: 4300,
1638+
LoadWarehousesGCE: 5000,
1639+
LoadWarehousesAWS: 5000,
1640+
LoadWarehousesAzure: 5000,
1641+
LoadWarehousesIBM: 5000,
1642+
EstimatedMaxGCE: 4500,
1643+
EstimatedMaxAWS: 4500,
1644+
EstimatedMaxAzure: 4500,
1645+
EstimatedMaxIBM: 4500,
16461646
ExpirationLeases: true,
16471647
Clouds: registry.AllClouds,
16481648
Suites: registry.Suites(registry.Nightly),
@@ -1651,10 +1651,10 @@ func registerTPCC(r registry.Registry) {
16511651
Nodes: 12,
16521652
CPUs: 16,
16531653

1654-
LoadWarehousesGCE: 15000,
1655-
LoadWarehousesAWS: 15000,
1656-
LoadWarehousesAzure: 15000,
1657-
LoadWarehousesIBM: 15000,
1654+
LoadWarehousesGCE: 18000,
1655+
LoadWarehousesAWS: 18000,
1656+
LoadWarehousesAzure: 18000,
1657+
LoadWarehousesIBM: 18000,
16581658
EstimatedMaxGCE: 13000,
16591659
EstimatedMaxAWS: 13000,
16601660
EstimatedMaxAzure: 13000,
@@ -1673,14 +1673,14 @@ func registerTPCC(r registry.Registry) {
16731673
Nodes: 3,
16741674
CPUs: 16,
16751675

1676-
LoadWarehousesGCE: 4700,
1677-
LoadWarehousesAWS: 4700,
1678-
LoadWarehousesAzure: 4700,
1679-
LoadWarehousesIBM: 4700,
1680-
EstimatedMaxGCE: 4300,
1681-
EstimatedMaxAWS: 4300,
1682-
EstimatedMaxAzure: 4300,
1683-
EstimatedMaxIBM: 4300,
1676+
LoadWarehousesGCE: 5000,
1677+
LoadWarehousesAWS: 5000,
1678+
LoadWarehousesAzure: 5000,
1679+
LoadWarehousesIBM: 5000,
1680+
EstimatedMaxGCE: 4500,
1681+
EstimatedMaxAWS: 4500,
1682+
EstimatedMaxAzure: 4500,
1683+
EstimatedMaxIBM: 4500,
16841684
WriteOptimization: registry.Buffering,
16851685

16861686
Clouds: registry.AllClouds,
@@ -1694,14 +1694,14 @@ func registerTPCC(r registry.Registry) {
16941694
Nodes: 3,
16951695
CPUs: 16,
16961696

1697-
LoadWarehousesGCE: 4700,
1698-
LoadWarehousesAWS: 4700,
1699-
LoadWarehousesAzure: 4700,
1700-
LoadWarehousesIBM: 4700,
1701-
EstimatedMaxGCE: 4300,
1702-
EstimatedMaxAWS: 4300,
1703-
EstimatedMaxAzure: 4300,
1704-
EstimatedMaxIBM: 4300,
1697+
LoadWarehousesGCE: 5000,
1698+
LoadWarehousesAWS: 5000,
1699+
LoadWarehousesAzure: 5000,
1700+
LoadWarehousesIBM: 5000,
1701+
EstimatedMaxGCE: 4500,
1702+
EstimatedMaxAWS: 4500,
1703+
EstimatedMaxAzure: 4500,
1704+
EstimatedMaxIBM: 4500,
17051705
WriteOptimization: registry.PipeliningBuffering,
17061706

17071707
Clouds: registry.AllClouds,

0 commit comments

Comments
 (0)