Update to OpenZFS 2.2.2

Migrate go-libzfs to a fork including 2.2.2 support. Signed-off-by: Andrew Durbin <andrewd@zededa.com>
lf-edge · Mar 5, 2024 · f11b95d · f11b95d
1 parent ccd73f5
commit f11b95d
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 24 deletions.
diff --git a/pkg/pillar/Dockerfile b/pkg/pillar/Dockerfile
@@ -10,7 +10,7 @@ ARG BUILD_PKGS_BASE="git gcc linux-headers libc-dev make linux-pam-dev m4 findut
 # we use the same image in several places
 ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:9fb9b9cbf7d90066a70e4704d04a6fe248ff52bb
 
-FROM lfedge/eve-dom0-ztools:417d4ff6a57d2317c9e65166274b0ea6f6da16e2 as zfs
+FROM lfedge/eve-dom0-ztools:81a7af28b32c7558e1c4622e60a9e3197075decd as zfs
 RUN mkdir /out
 # copy zfs-related files from dom0-ztools using prepared list of files
 RUN while read -r x; do \

diff --git a/pkg/pillar/cmd/zfsmanager/handlediskconfig.go b/pkg/pillar/cmd/zfsmanager/handlediskconfig.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	libzfs "github.com/bicomsystems/go-libzfs"
+	libzfs "github.com/andrewd-zededa/go-libzfs"
 	"github.com/lf-edge/eve/pkg/pillar/types"
 	"github.com/lf-edge/eve/pkg/pillar/utils/disks"
 	"github.com/lf-edge/eve/pkg/pillar/vault"

diff --git a/pkg/pillar/cmd/zfsmanager/zfsstoragemetrics.go b/pkg/pillar/cmd/zfsmanager/zfsstoragemetrics.go
@@ -6,7 +6,7 @@ package zfsmanager
 import (
 	"time"
 
-	libzfs "github.com/bicomsystems/go-libzfs"
+	libzfs "github.com/andrewd-zededa/go-libzfs"
 	"github.com/lf-edge/eve/pkg/pillar/types"
 	"github.com/lf-edge/eve/pkg/pillar/vault"
 	"github.com/lf-edge/eve/pkg/pillar/zfs"

diff --git a/pkg/pillar/cmd/zfsmanager/zfsstoragestatus.go b/pkg/pillar/cmd/zfsmanager/zfsstoragestatus.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	libzfs "github.com/bicomsystems/go-libzfs"
+	libzfs "github.com/andrewd-zededa/go-libzfs"
 	"github.com/lf-edge/eve/pkg/pillar/types"
 	"github.com/lf-edge/eve/pkg/pillar/vault"
 	"github.com/lf-edge/eve/pkg/pillar/zfs"

diff --git a/pkg/pillar/go.mod b/pkg/pillar/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/anatol/smart.go v0.0.0-20220615232124-371056cd18c3
-	github.com/bicomsystems/go-libzfs v0.4.0
+	github.com/andrewd-zededa/go-libzfs v0.0.0-20240304231806-6a64e99da97d
 	github.com/containerd/cgroups v1.1.0
 	github.com/containerd/containerd v1.7.13
 	github.com/containerd/typeurl v1.0.2

diff --git a/pkg/pillar/go.sum b/pkg/pillar/go.sum
@@ -631,6 +631,10 @@ github.com/anatol/vmtest v0.0.0-20220413190228-7a42f1f6d7b8 h1:t4JGeY9oaF5LB4Rdx
 github.com/anatol/vmtest v0.0.0-20220413190228-7a42f1f6d7b8/go.mod h1:oPm5wWoqTSkeoPe1Q3sPryTK8o24Jcbwh8dKOiiIobk=
 github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1rlcoLz8y5B2r4tTLMiVTrMtpfY0O8EScKJxaSaEc=
 github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA=
+github.com/andrewd-zededa/go-libzfs v0.0.0-20240304220234-b1d1e139a96f h1:h3NlPxTPz+1d4h9Ti3DOpvzi6ZQv+vtoNJLlSsvG/uQ=
+github.com/andrewd-zededa/go-libzfs v0.0.0-20240304220234-b1d1e139a96f/go.mod h1:vr7ylGirAMvXzO7cdSQkMKFn0k9XDij67ZgDfPXsKKg=
+github.com/andrewd-zededa/go-libzfs v0.0.0-20240304231806-6a64e99da97d h1:/L/7th+IDBOJVHUEBuCOr4aurp5t5cMT2mRrARuMsPU=
+github.com/andrewd-zededa/go-libzfs v0.0.0-20240304231806-6a64e99da97d/go.mod h1:vr7ylGirAMvXzO7cdSQkMKFn0k9XDij67ZgDfPXsKKg=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -656,8 +660,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bicomsystems/go-libzfs v0.4.0 h1:rezv5ZTVe31o2MbACEDrTYAeRO4rSHm70DHOTTas/yU=
-github.com/bicomsystems/go-libzfs v0.4.0/go.mod h1:/ABUjxseIy72AxJV8ROgSfeZ5YA8/ZSp1mMzfDKi0Mw=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=

diff --git a/pkg/pillar/vault/handler_zfs.go b/pkg/pillar/vault/handler_zfs.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	libzfs "github.com/bicomsystems/go-libzfs"
+	libzfs "github.com/andrewd-zededa/go-libzfs"
 	"github.com/lf-edge/eve-api/go/info"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	etpm "github.com/lf-edge/eve/pkg/pillar/evetpm"

diff --git a/...hub.com/bicomsystems/go-libzfs/.gitignore → ...b.com/andrewd-zededa/go-libzfs/.gitignore b/...hub.com/bicomsystems/go-libzfs/.gitignore → ...b.com/andrewd-zededa/go-libzfs/.gitignore
diff --git a/...hub.com/bicomsystems/go-libzfs/LICENSE.md → ...b.com/andrewd-zededa/go-libzfs/LICENSE.md b/...hub.com/bicomsystems/go-libzfs/LICENSE.md → ...b.com/andrewd-zededa/go-libzfs/LICENSE.md
diff --git a/...thub.com/bicomsystems/go-libzfs/README.md → ...ub.com/andrewd-zededa/go-libzfs/README.md b/...thub.com/bicomsystems/go-libzfs/README.md → ...ub.com/andrewd-zededa/go-libzfs/README.md
diff --git a/...ithub.com/bicomsystems/go-libzfs/common.c → ...hub.com/andrewd-zededa/go-libzfs/common.c b/...ithub.com/bicomsystems/go-libzfs/common.c → ...hub.com/andrewd-zededa/go-libzfs/common.c
diff --git a/...thub.com/bicomsystems/go-libzfs/common.go → ...ub.com/andrewd-zededa/go-libzfs/common.go b/...thub.com/bicomsystems/go-libzfs/common.go → ...ub.com/andrewd-zededa/go-libzfs/common.go
diff --git a/...ithub.com/bicomsystems/go-libzfs/common.h → ...hub.com/andrewd-zededa/go-libzfs/common.h b/...ithub.com/bicomsystems/go-libzfs/common.h → ...hub.com/andrewd-zededa/go-libzfs/common.h
diff --git a/...ub.com/bicomsystems/go-libzfs/sendrecv.go → ....com/andrewd-zededa/go-libzfs/sendrecv.go b/...ub.com/bicomsystems/go-libzfs/sendrecv.go → ....com/andrewd-zededa/go-libzfs/sendrecv.go
diff --git a/...github.com/bicomsystems/go-libzfs/sort.go → ...thub.com/andrewd-zededa/go-libzfs/sort.go b/...github.com/bicomsystems/go-libzfs/sort.go → ...thub.com/andrewd-zededa/go-libzfs/sort.go
diff --git a/...r/github.com/bicomsystems/go-libzfs/zfs.c → ...github.com/andrewd-zededa/go-libzfs/zfs.c b/...r/github.com/bicomsystems/go-libzfs/zfs.c → ...github.com/andrewd-zededa/go-libzfs/zfs.c
diff --git a/.../github.com/bicomsystems/go-libzfs/zfs.go → ...ithub.com/andrewd-zededa/go-libzfs/zfs.go b/.../github.com/bicomsystems/go-libzfs/zfs.go → ...ithub.com/andrewd-zededa/go-libzfs/zfs.go
diff --git a/...r/github.com/bicomsystems/go-libzfs/zfs.h → ...github.com/andrewd-zededa/go-libzfs/zfs.h b/...r/github.com/bicomsystems/go-libzfs/zfs.h → ...github.com/andrewd-zededa/go-libzfs/zfs.h
diff --git a/...github.com/bicomsystems/go-libzfs/zpool.c → ...thub.com/andrewd-zededa/go-libzfs/zpool.c b/...github.com/bicomsystems/go-libzfs/zpool.c → ...thub.com/andrewd-zededa/go-libzfs/zpool.c
diff --git a/...ithub.com/bicomsystems/go-libzfs/zpool.go → ...hub.com/andrewd-zededa/go-libzfs/zpool.go b/...ithub.com/bicomsystems/go-libzfs/zpool.go → ...hub.com/andrewd-zededa/go-libzfs/zpool.go
diff --git a/...github.com/bicomsystems/go-libzfs/zpool.h → ...thub.com/andrewd-zededa/go-libzfs/zpool.h b/...github.com/bicomsystems/go-libzfs/zpool.h → ...thub.com/andrewd-zededa/go-libzfs/zpool.h
diff --git a/...b.com/bicomsystems/go-libzfs/zpool_vdev.c → ...com/andrewd-zededa/go-libzfs/zpool_vdev.c b/...b.com/bicomsystems/go-libzfs/zpool_vdev.c → ...com/andrewd-zededa/go-libzfs/zpool_vdev.c
diff --git a/....com/bicomsystems/go-libzfs/zpool_vdev.go → ...om/andrewd-zededa/go-libzfs/zpool_vdev.go b/....com/bicomsystems/go-libzfs/zpool_vdev.go → ...om/andrewd-zededa/go-libzfs/zpool_vdev.go
diff --git a/pkg/pillar/vendor/modules.txt b/pkg/pillar/vendor/modules.txt
@@ -81,6 +81,9 @@ github.com/anatol/smart.go
 # github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092
 ## explicit; go 1.18
 github.com/anchore/go-struct-converter
+# github.com/andrewd-zededa/go-libzfs v0.0.0-20240304231806-6a64e99da97d
+## explicit; go 1.13
+github.com/andrewd-zededa/go-libzfs
 # github.com/aws/aws-sdk-go v1.44.82
 ## explicit; go 1.11
 github.com/aws/aws-sdk-go/aws
@@ -137,9 +140,6 @@ github.com/aws/aws-sdk-go/service/sts/stsiface
 # github.com/beorn7/perks v1.0.1
 ## explicit; go 1.11
 github.com/beorn7/perks/quantile
-# github.com/bicomsystems/go-libzfs v0.4.0
-## explicit; go 1.13
-github.com/bicomsystems/go-libzfs
 # github.com/bugsnag/bugsnag-go v1.4.1
 ## explicit
 # github.com/bugsnag/panicwrap v1.2.0

diff --git a/pkg/pillar/zfs/zfs.go b/pkg/pillar/zfs/zfs.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	libzfs "github.com/bicomsystems/go-libzfs"
+	libzfs "github.com/andrewd-zededa/go-libzfs"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	"github.com/lf-edge/eve/pkg/pillar/hardware"
 	"github.com/lf-edge/eve/pkg/pillar/types"