Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/follow hotfixes #993

Merged
merged 5 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# IPFS Cluster Changelog

### v0.12.1 - 2019-12-24

IPFS Cluster v0.12.1 is a maintenance release fixing issues on `ipfs-cluster-follow`.

#### List of changes

##### Bug fixes

* follow: the `info` command panics when ipfs is offline | @991 | @993
* follow: the gateway url is not set on Run&Init command | @992 | @993
* follow: disallow trusted peers for RepoGCLocal operation | @993

---

### v0.12.0 - 2019-12-20

Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs-cluster-ctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const programName = `ipfs-cluster-ctl`

// Version is the cluster-ctl tool version. It should match
// the IPFS cluster's version
const Version = "0.12.0"
const Version = "0.12.1"

var (
defaultHost = "/ip4/127.0.0.1/tcp/9094"
Expand Down
8 changes: 7 additions & 1 deletion cmd/ipfs-cluster-follow/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,12 @@ func infoCmd(c *cli.Context) error {
if err != nil {
if config.IsErrFetchingSource(err) {
url = fmt.Sprintf(
"failed retrieving configuration source: %s",
"failed retrieving configuration source (%s)",
cfgHelper.Manager().Source,
)
ipfsCfg := ipfshttp.Config{}
ipfsCfg.Default()
cfgHelper.Configs().Ipfshttp = &ipfsCfg
} else {
return cli.Exit(errors.Wrapf(err, "reading the configurations in %s", absPath), 1)
}
Expand Down Expand Up @@ -286,6 +289,9 @@ func runCmd(c *cli.Context) error {

// Always run followers in follower mode.
cfgs.Cluster.FollowerMode = true
// Do not let trusted peers GC this peer
// Defaults to Trusted otherwise.
cfgs.Cluster.RPCPolicy["Cluster.RepoGCLocal"] = ipfscluster.RPCClosed

// Discard API configurations and create our own
apiCfg := rest.Config{}
Expand Down
7 changes: 7 additions & 0 deletions cmd/ipfs-cluster-follow/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,13 @@ The peer will stay running in the foreground until manually stopped.
Name: "init",
Usage: "initialize cluster peer with the given URL before running",
},
&cli.StringFlag{
Name: "gateway",
Value: DefaultGateway,
Usage: "gateway URL",
EnvVars: []string{"IPFS_GATEWAY"},
Hidden: true,
},
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

// Version is the current cluster version. Version alignment between
// components, apis and tools ensures compatibility among them.
var Version = semver.MustParse("0.12.0")
var Version = semver.MustParse("0.12.1")

// RPCProtocol is used to send libp2p messages between cluster peers
var RPCProtocol = protocol.ID(
Expand Down