Skip to content

Commit afbf3f1

Browse files
committed
Added option to enable back ILM expiry for replication
Signed-off-by: Shubhendu Ram Tripathi <shubhendu@minio.io>
1 parent de452c9 commit afbf3f1

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ require (
126126
github.com/rivo/tview v0.0.0-20230909130259-ba6a2a345459 // indirect
127127
github.com/rivo/uniseg v0.4.4 // indirect
128128
github.com/rjeczalik/notify v0.9.3 // indirect
129-
github.com/safchain/ethtool v0.3.0 // indirect
130129
github.com/shirou/gopsutil/v3 v3.23.8 // indirect
131130
github.com/shoenig/go-m1cpu v0.1.6 // indirect
132131
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -156,6 +155,6 @@ require (
156155
gopkg.in/yaml.v3 v3.0.1 // indirect
157156
)
158157

159-
replace github.com/minio/madmin-go/v3 v3.0.21 => github.com/shtripat/madmin-go/v3 v3.0.0-20231012100328-e3cb014d93b4
158+
replace github.com/minio/madmin-go/v3 v3.0.21 => github.com/shtripat/madmin-go/v3 v3.0.0-20231017111648-65788bbf47a1
160159

161-
replace github.com/minio/mc v0.0.0-20230907224855-9dcef8825fae => github.com/shtripat/mc v0.0.0-20231012100505-5ee893f6a6bb
160+
replace github.com/minio/mc v0.0.0-20230907224855-9dcef8825fae => github.com/shtripat/mc v0.0.0-20231017123555-8c92d6fde5bc

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
326326
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
327327
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
328328
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
329-
github.com/safchain/ethtool v0.3.0 h1:gimQJpsI6sc1yIqP/y8GYgiXn/NjgvpM0RNoWLVVmP0=
330-
github.com/safchain/ethtool v0.3.0/go.mod h1:SA9BwrgyAqNo7M+uaL6IYbxpm5wk3L7Mm6ocLW+CJUs=
331329
github.com/secure-io/sio-go v0.3.1 h1:dNvY9awjabXTYGsTF1PiCySl9Ltofk9GA3VdWlo7rRc=
332330
github.com/secure-io/sio-go v0.3.1/go.mod h1:+xbkjDzPjwh4Axd07pRKSNriS9SCiYksWnZqdnfpQxs=
333331
github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE=
@@ -336,10 +334,10 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
336334
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
337335
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
338336
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
339-
github.com/shtripat/madmin-go/v3 v3.0.0-20231012100328-e3cb014d93b4 h1:m75WkTz0ey4Gbl8POaf+hFCyhRiI6EUVm5i84uGOQD8=
340-
github.com/shtripat/madmin-go/v3 v3.0.0-20231012100328-e3cb014d93b4/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8=
341-
github.com/shtripat/mc v0.0.0-20231012100505-5ee893f6a6bb h1:z1cp41HJp1a9zy9eIUllIwbD+SAatXG6RDaa9HJ1O/8=
342-
github.com/shtripat/mc v0.0.0-20231012100505-5ee893f6a6bb/go.mod h1:nIFEN0hA60iYDGBToW6pyDsNBepDR6qUMm8MCOJl8E8=
337+
github.com/shtripat/madmin-go/v3 v3.0.0-20231017111648-65788bbf47a1 h1:FkfzyBLsLM5uX4+cdaMfuY+6WDos/VB9lOHeyviKhZE=
338+
github.com/shtripat/madmin-go/v3 v3.0.0-20231017111648-65788bbf47a1/go.mod h1:B2EgtEGrfWx+AkXv+OAcS6IHwoIJcd1p75QfDPSPd6Q=
339+
github.com/shtripat/mc v0.0.0-20231017123555-8c92d6fde5bc h1:06vmlRtI33rVzrSDkBp/f5QhDMlE7NIHjFbZ7QDOGlc=
340+
github.com/shtripat/mc v0.0.0-20231017123555-8c92d6fde5bc/go.mod h1:HvO39OOHK77WwT2bu0JuMpdCYPAAVcVXkNFmf/uv3mo=
343341
github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
344342
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
345343
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=

restapi/admin_site_replication.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,14 @@ func editSiteReplication(ctx context.Context, client MinioAdmin, params *siteRep
192192
}
193193
qs := runtime.Values(params.HTTPRequest.URL.Query())
194194
_, qhkDisableILMExpiryReplication, _ := qs.GetOK("disable-ilm-expiry-replication")
195+
_, qhkEnableILMExpiryReplication, _ := qs.GetOK("enable-ilm-expiry-replication")
195196
var opts madmin.SREditOptions
196197
if qhkDisableILMExpiryReplication {
197198
opts.DisableILMExpiryReplication = true
198199
}
200+
if qhkEnableILMExpiryReplication {
201+
opts.EnableILMExpiryReplication = true
202+
}
199203
eRes, err := client.editSiteReplicationInfo(ctx, *peerSiteInfo, opts)
200204
if err != nil {
201205
return nil, err

0 commit comments

Comments
 (0)