From c32b8af65ffbc84d8be6da01ce6514d99c02d5fe Mon Sep 17 00:00:00 2001 From: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Date: Mon, 28 Nov 2022 23:28:32 -0500 Subject: [PATCH 1/2] build:release: v1.18.1 prep (#9744) * fix: cli: check found before dereferencing SectorInfo * v1.18.1 prep * Docsgen-cli Co-authored-by: Aayush Co-authored-by: Geoff Stuart --- CHANGELOG.md | 18 ++++++++++++++++++ build/openrpc/full.json.gz | Bin 29039 -> 29039 bytes build/openrpc/gateway.json.gz | Bin 5104 -> 5104 bytes build/openrpc/miner.json.gz | Bin 16046 -> 16046 bytes build/openrpc/worker.json.gz | Bin 5256 -> 5256 bytes build/version.go | 2 +- cmd/lotus-miner/sectors.go | 6 +++--- documentation/en/cli-lotus-miner.md | 2 +- documentation/en/cli-lotus-worker.md | 2 +- documentation/en/cli-lotus.md | 2 +- 10 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93cf5da43..65576d224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Lotus changelog +# 1.18.1 / 2022-11-28 + +This is a small OPTIONAL patch release for the mandatory v1.18.0 release that supports the Filecoin nv17 Shark Upgrade. +We highly recommend you to read the full [v1.18.0 release note](https://github.com/filecoin-project/lotus/releases/tag/v1.18.0) if you haven't already. + +Note to SPs: +If you are running into issue with updating your miner node from an earlier release and is failing to restart your miner, check your `journalctl` and see if you noticed the following error: +``` +New sector storage: <%d> +Nov 19 15:03:43 g0lotus01 lotus-miner[]: ERROR: creating node: starting node: could not build arguments for function "reflect".makeFuncStub (/usr/local/go/src/reflect/asm_amd64.s:28): failed to build *paths.Local: received non-nil error from function "reflect".makeFuncStub (/usr/local/go/src/reflect/asm_amd64.s:28): opening path /media/data1/lotusstorage: path with ID <%d> already opened: '' +``` +If so, this check is introduced via [#9032](https://github.com/filecoin-project/lotus/pull/9032), precisely this [line](https://github.com/filecoin-project/lotus/blame/master/storage/paths/local.go#L164-L166 +). It's added to prevents double-attaching paths given it's now possible to manipulate paths at runtime. Verify storage.json configs if you encounter this error or remove the undesired depulicated path as you see fit accordingly. + +## Bug Fixes + +- fix: cli: check found before dereferencing SectorInfo #9703 + # 1.18.0 / 2022-11-15 > ⚠️ **Please note that from Lotus v1.17.2&^ will require a Go-version of v1.18.1&^** diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 0072174fcca109684e733edadb8bba035f7e1b50..1322bebc32a2737c3d087a7ad37f74974ffe857a 100644 GIT binary patch delta 23 fcmaF=i1Ga+#tEH_Yd3b?E#PQ6dZ2#$T2=-Cn=uRP delta 23 fcmaF=i1Ga+#tEH_XE%1;E#MILo$I)LEh_^6lqm|s diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz index 3b0b9c5dfcb356003a0744cbb738b9202b45fc96..1b244cf48dc3b1689755ba8d6eed58705bb90abc 100644 GIT binary patch delta 3082 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 diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz index 834ffefe8eee95c98394f40107398704c2cc25b9..bdf5410cacbc69557c16e83d9f80fd0b34fa7743 100644 GIT binary patch delta 5171 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%0Dpn%m<<#R=>d`@YJ1B2>*_?G3`go@ z7!xk~`1yoO`u_1?Jeg?vV4}tcH1hcQgsbTJo6!1$Jby!4Uv>&`6s=E!K&!Mq2>~tA z`Un6R_Hv17uU{_!q#hj`0LlvV`~Xl^GEM+!m2fqX|K^0N4*(9<`nmz24y|tn0BRb$ z8h>U1%?Ve-9H1%T(g2`}MW45_AFvZosd=%nuKfU2(Urb3(T9Vf*biuv0lbp^fTI~e z+5LcH89)RUOh}=D%`8-C)hsKC6Ri?12^g&s?nNybwMw`oO0-J2ByO}yxFmqIO1Kxb zn$#lUBB(L*Ph-x&jJ~3e2cuzP;uAiraevm6%?y$taa?KA(}-hAlU_JFrZnl5qGL*v zbo9rSCh6IaD@}SXa7<~^3qi+}CcW}=JZU1{*>O=b%l&U+zjv$*G-bG*+ErY=D-XDP zjd{vr50$<;8R%+Xk59v6bG`ayE9t;hMIB6(v96929jA?SZ9Exh`l#-muLAMJZhtS= z0#9pnKIz|ErSmCw-zJ^U^#6yf_GgHhv;1^K04Oa{!|VNrh{n6)yI(LfnsAb%o*o@J&WB7<5S7$G8qL}ZYN3<@B^MRP=gyW;PH zE7-+Gg7|RkS)zbi^a+jFN)R88JyWPpi?lul1CdFBKmmaQ0tEyL2o!i@D6k^zmvH~w z?!PsW6(X8QL=%Zzld2Dy=?A9_>?2dEgNE{sZS~5fV#PO41A*IMA=dqsa{_?~tj!{VHR>|Rr zsq$k+gX4->s*m=TQ!;tXc=+@9)>SGSPxlnuk5}!<>$ps0q>Qr<&;DlLqf2VL(7(rk z=M3#gPTsq4lh2tnfB2Vea(`Wp8u}?Z6c^yO?h2seUx1sZ%+1|%QuUG(aa*jo zE%vqHT7Qy_Yv+(IJWfRO^JHHO5xoK^!~>SP2%Y@W3U8*$ERqYJwh}jTJw%Rxh1Vm+ z)0Mi9#diav;jBLykEb0p)0B>Gj!%>Jadd-%Oa+hVh(Vf#w5-i9|4CFf0%He|frwze9uy{_9|Mw*gi z=&o%b&$~pP7w9yX#m6#doBnEr&F$S z8F=tp4ZI+~4Cdjzc7JA=&{~6s1tMX(8{!1@0gpnLdN<@iPqJ%tYIve=N?cr3iY+v9 zvDMS~|2oV}@8_D?J-P@swS$Y#(leJQZ7o>>@4V5#X7?1E{$-Q<-}?49=kzf{pr)pg z*=>K;dnCoQ@?}jcL!Ewl7MXdyVZ5wUYyy{6?;%2&tMiaG>wg4kri?flVHwagUF3Pl z1bA0k7o1V%AZNC_L?)Q70R(>{Hvkd{PHhtz;N8Ol8w-GmiCGg_9m|zPvBBPU9BAAj zb5{%XmwF&E0R-Pzss;2G-S{N8o+~gT94Mq!HCzWOMy4GjlfDmAjLZ>7MyxK0)uq?A zx-?MBvf(s<^MA5owPrRf17{G)8`kwFB-pZ`&u_eg3A6fqgjvlX%&dumG`Ga|1!;cc z1VE7H7ceq{G`DqR1_kJo1>WWMSJHRd$G1OHQrCEizhM7@{l8@PKh(0>{{^xT^w5cC7=AX#T%lf0ctrw8Yd4r}B)i*`p)2$T2Q!O*sHh&QIls1=*8u)!S^AKetrRuVD ziGQNtclF)6jpUM-fiQSd*FAvKrUB^MG*i-+gZ}ub8MW?Y@4+JPJPevmA|blD5N8+`KhXb#tsW-af%u+hPAL z^%pSoMMxA$2roJrXWAw zTVjVLDs>&cR1+&i2@ir60%dUt@SyScJz{M3QdHmtx`5d{x3lkoU4sT9hMmb+jhhIH? zG)@2HV_vn1=gyy=yO_+26e(WL!GHRc5-Z>H);5p!R})JyirCrMbsp~a=Cpd8^SNTE z0G|d7-0$MqD5h85VR8v5I&Zc~1YA z=$QNaR8K8OWR+eM4x~hWmTjk47nDPVzBZXasOTMas17>1KJ9m=(9}CqQyEPMlc}m2 zdS$dI+;b7j8qa2478n<; zc?y(UfCX@>BDT{NlOh9nqHLEOLh_K!4|Er6?K#!EJK~ zuXR7sitJfQVfr$&ldWAbE!~>d$>ZjUDM(?2!t0J5m<)5aL4(gm{qR;!>xty79yxbK z9B7)z{IsU%jF{-h?f{DI8^3}}{1f>HPh@@^FsOJVSfm9_#ofg_NgOvJ0`N)(;H3=X z=>yw&B0{3~ODnpfjeqs3w@g2IwnWO18*GVMM>EogM!dSOHPQz#h-(4FU0NboRRpWn zMmR?~F+`y)bCS(4SN240=N|H@UYMkS=7lM^*xg>LMs|Agx@!NtAsp5EV_m6?q%Bp* zaZZrZUl7xOuP~yVD!I$Y7r?R0cIXONwEk@M+gCNUY~#)YD=b2>1?U2~2tXGB5(H~{ hz+DmIhj@x84?d-u_+OQ7{yzW!|Np0HENN>o0RXd=8J7S6 delta 5171 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 diff --git a/build/version.go b/build/version.go index fc01c8ba0..e1a967422 100644 --- a/build/version.go +++ b/build/version.go @@ -37,7 +37,7 @@ func BuildTypeString() string { } // BuildVersion is the local build version -const BuildVersion = "1.18.0" +const BuildVersion = "1.18.1" func UserVersion() string { if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" { diff --git a/cmd/lotus-miner/sectors.go b/cmd/lotus-miner/sectors.go index 44bce55bc..1beaf0cbb 100644 --- a/cmd/lotus-miner/sectors.go +++ b/cmd/lotus-miner/sectors.go @@ -918,12 +918,12 @@ var sectorsRenewCmd = &cli.Command{ } si, found := activeSectorsInfo[abi.SectorNumber(id)] - if len(si.DealIDs) > 0 && cctx.Bool("only-cc") { - continue - } if !found { return xerrors.Errorf("sector %d is not active", id) } + if len(si.DealIDs) > 0 && cctx.Bool("only-cc") { + continue + } sis = append(sis, si) } diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md index 4096c630b..25a9ae29d 100644 --- a/documentation/en/cli-lotus-miner.md +++ b/documentation/en/cli-lotus-miner.md @@ -7,7 +7,7 @@ USAGE: lotus-miner [global options] command [command options] [arguments...] VERSION: - 1.18.0 + 1.18.1 COMMANDS: init Initialize a lotus miner repo diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md index 73766ad54..98bbf713d 100644 --- a/documentation/en/cli-lotus-worker.md +++ b/documentation/en/cli-lotus-worker.md @@ -7,7 +7,7 @@ USAGE: lotus-worker [global options] command [command options] [arguments...] VERSION: - 1.18.0 + 1.18.1 COMMANDS: run Start lotus worker diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md index f74ca66b3..8d2a01bc6 100644 --- a/documentation/en/cli-lotus.md +++ b/documentation/en/cli-lotus.md @@ -7,7 +7,7 @@ USAGE: lotus [global options] command [command options] [arguments...] VERSION: - 1.18.0 + 1.18.1 COMMANDS: daemon Start a lotus daemon process From dbe5278afad7857dca734041c57841be60b10fb3 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Tue, 6 Dec 2022 17:29:32 -0500 Subject: [PATCH 2/2] fix conflicts --- documentation/en/cli-lotus-miner.md | 4 ---- documentation/en/cli-lotus-worker.md | 4 ---- documentation/en/cli-lotus.md | 4 ---- 3 files changed, 12 deletions(-) diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md index e0613659f..b666d8ca7 100644 --- a/documentation/en/cli-lotus-miner.md +++ b/documentation/en/cli-lotus-miner.md @@ -7,11 +7,7 @@ USAGE: lotus-miner [global options] command [command options] [arguments...] VERSION: -<<<<<<< HEAD 1.19.1-dev -======= - 1.18.1 ->>>>>>> releases COMMANDS: init Initialize a lotus miner repo diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md index ef3901a9b..74b7a19b8 100644 --- a/documentation/en/cli-lotus-worker.md +++ b/documentation/en/cli-lotus-worker.md @@ -7,11 +7,7 @@ USAGE: lotus-worker [global options] command [command options] [arguments...] VERSION: -<<<<<<< HEAD 1.19.1-dev -======= - 1.18.1 ->>>>>>> releases COMMANDS: run Start lotus worker diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md index c935aee8f..2f662f017 100644 --- a/documentation/en/cli-lotus.md +++ b/documentation/en/cli-lotus.md @@ -7,11 +7,7 @@ USAGE: lotus [global options] command [command options] [arguments...] VERSION: -<<<<<<< HEAD 1.19.1-dev -======= - 1.18.1 ->>>>>>> releases COMMANDS: daemon Start a lotus daemon process