diff --git a/controller/persistence/testing.go b/controller/persistence/testing.go index c7df93a35..274fd4189 100644 --- a/controller/persistence/testing.go +++ b/controller/persistence/testing.go @@ -93,7 +93,7 @@ func (ctx *TestContext) Init() { ctx.BaseTestContext.InitDbFile() var err error - ctx.db, err = db.Open(ctx.GetDbFile().Name()) + ctx.db, err = db.Open(ctx.GetDbFile().Name(), false) ctx.NoError(err) ctx.fabricStores, err = db.InitStores(ctx.GetDb()) diff --git a/go.mod b/go.mod index 66ab3e4a5..9f74b2f09 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,8 @@ go 1.16 //replace github.com/kataras/go-events => ../go-events +replace go.etcd.io/bbolt => github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e + require ( github.com/AppsFlyer/go-sundheit v0.2.0 github.com/Jeffail/gabs v1.4.0 @@ -39,7 +41,7 @@ require ( github.com/miekg/dns v1.1.40 github.com/mitchellh/mapstructure v1.4.1 github.com/netfoundry/secretstream v0.1.2 - github.com/openziti/fabric v0.16.28 + github.com/openziti/fabric v0.16.29 github.com/openziti/foundation v0.15.36 github.com/openziti/sdk-golang v0.15.24 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 diff --git a/go.sum b/go.sum index 3fdb8f5a2..216b5cf18 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openziti/fabric v0.16.28 h1:H/0OAMwjlg9Y7/gM0MyMxTMGn+XVx9/ZH/MHGarOhww= -github.com/openziti/fabric v0.16.28/go.mod h1:iAal/QhB//MeA2z4bW2hwkfSrIXWaLAAgB974wLgqH0= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5+Wa7LQtpGS6/xK7Z+KQXvOAtYgJlA= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +github.com/openziti/fabric v0.16.29 h1:yWAsIzpnyUY8J0i+cI9twPkWfpytjVdrh3FmYO/IeWE= +github.com/openziti/fabric v0.16.29/go.mod h1:p+SwZBxWiB98i4YKwrxGtGQT280erLHYC5h0mZLv0mM= github.com/openziti/foundation v0.15.36 h1:3XADgT1VwDJd/R+YmTu+EuLeQEMhtWn+0RvI5d4Blgo= github.com/openziti/foundation v0.15.36/go.mod h1:wWyy60CAEKBKF354v1FpRGaMIWJIjI/i+hpwsQ5IiZo= github.com/openziti/sdk-golang v0.15.24 h1:qHIAi4Bdw1lCmAmlxb7AwsyHXiVdi+FMyxVVkeXI5fM= @@ -629,9 +631,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 h1:ASw9n1EHMftwnP3Az4XW6e308+gNsrHzmdhd0Olz9Hs= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= diff --git a/util/debug-db/debug-db.go b/util/debug-db/debug-db.go index a2c62c840..e4e3a33ef 100644 --- a/util/debug-db/debug-db.go +++ b/util/debug-db/debug-db.go @@ -50,7 +50,7 @@ func (provider *dbProvider) GetControllers() *network.Controllers { } func run(dbFile string) { - boltDb, err := db.Open(dbFile) + boltDb, err := db.Open(dbFile, false) noError(err) fabricStores, err := db.InitStores(boltDb)