Skip to content

Commit 210c398

Browse files
s: move to netip addr
1 parent c431096 commit 210c398

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

pkg/service/repair/helper_integration_test.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,12 @@ func parseRepairAsyncReq(t *testing.T, req *http.Request) repairReq {
210210
host: netip.MustParseAddr(req.URL.Hostname()),
211211
keyspace: strings.TrimPrefix(req.URL.Path, repairAsyncEndpoint+"/"),
212212
table: req.URL.Query().Get("columnFamilies"),
213-
replicaSet: util2.ConvertSlice(strings.Split(req.URL.Query().Get("hosts"), ","), netip.MustParseAddr),
214213
ranges: parseRanges(t, req.URL.Query().Get("ranges")),
215214
smallTableOptimization: req.URL.Query().Get("small_table_optimization") == "true",
216215
}
216+
if replicaSet := req.URL.Query().Get("hosts"); replicaSet != "" {
217+
sched.replicaSet = util2.ConvertSlice(strings.Split(replicaSet, ","), netip.MustParseAddr)
218+
}
217219
if rawRangesParallelism := req.URL.Query().Get("ranges_parallelism"); rawRangesParallelism != "" {
218220
rangesParallelism, err := strconv.Atoi(rawRangesParallelism)
219221
if err != nil {
@@ -237,11 +239,15 @@ func parseTabletRepairReq(t *testing.T, req *http.Request) repairReq {
237239
}
238240

239241
sched := repairReq{
240-
host: netip.MustParseAddr(req.URL.Hostname()),
241-
keyspace: req.URL.Query().Get("ks"),
242-
table: req.URL.Query().Get("table"),
243-
dcFilter: strings.Split(req.URL.Query().Get("dcs_filter"), ","),
244-
hostFilter: util2.ConvertSlice(strings.Split(req.URL.Query().Get("hosts_filter"), ","), netip.MustParseAddr),
242+
host: netip.MustParseAddr(req.URL.Hostname()),
243+
keyspace: req.URL.Query().Get("ks"),
244+
table: req.URL.Query().Get("table"),
245+
}
246+
if dcFilter := req.URL.Query().Get("dcs_filter"); dcFilter != "" {
247+
sched.dcFilter = strings.Split(dcFilter, ",")
248+
}
249+
if hostsFilter := req.URL.Query().Get("hosts_filter"); hostsFilter != "" {
250+
sched.hostFilter = util2.ConvertSlice(strings.Split(hostsFilter, ","), netip.MustParseAddr)
245251
}
246252
if sched.keyspace == "" || sched.table == "" {
247253
t.Error("Not fully initialized tablet repair sched req")

0 commit comments

Comments
 (0)