2017-01-25 00:41:52 +00:00
|
|
|
deptools=deptools
|
2017-05-04 22:33:12 +00:00
|
|
|
sharness = sharness/lib/sharness
|
2018-10-18 12:09:19 +00:00
|
|
|
gx=$(deptools)/gx
|
|
|
|
|
gx-go=$(deptools)/gx-go
|
2017-01-24 20:40:43 +00:00
|
|
|
|
2017-07-20 11:18:46 +00:00
|
|
|
# For debugging
|
|
|
|
|
problematic_test = TestClustersReplicationRealloc
|
|
|
|
|
|
2017-01-25 00:41:52 +00:00
|
|
|
export PATH := $(deptools):$(PATH)
|
|
|
|
|
|
2018-09-20 02:19:30 +00:00
|
|
|
all: build
|
2017-05-05 16:09:36 +00:00
|
|
|
clean: rwundo clean_sharness
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-service clean
|
|
|
|
|
$(MAKE) -C cmd/ipfs-cluster-ctl clean
|
2018-05-02 02:34:09 +00:00
|
|
|
@rm -rf ./test/testingData
|
2017-05-05 16:09:36 +00:00
|
|
|
|
2016-12-21 19:04:28 +00:00
|
|
|
install: deps
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-service install
|
|
|
|
|
$(MAKE) -C cmd/ipfs-cluster-ctl install
|
2016-12-22 16:14:15 +00:00
|
|
|
|
2018-09-07 02:08:17 +00:00
|
|
|
docker_install: docker_deps
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-service install
|
|
|
|
|
$(MAKE) -C cmd/ipfs-cluster-ctl install
|
2018-09-07 02:08:17 +00:00
|
|
|
|
2017-01-24 15:19:23 +00:00
|
|
|
build: deps
|
2017-01-24 15:55:37 +00:00
|
|
|
go build -ldflags "-X ipfscluster.Commit=$(shell git rev-parse HEAD)"
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-service build
|
|
|
|
|
$(MAKE) -C cmd/ipfs-cluster-ctl build
|
2017-01-24 15:19:23 +00:00
|
|
|
|
2017-01-23 12:34:22 +00:00
|
|
|
service: deps
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-service ipfs-cluster-service
|
2017-01-23 12:34:22 +00:00
|
|
|
ctl: deps
|
2018-09-24 13:45:28 +00:00
|
|
|
$(MAKE) -C cmd/ipfs-cluster-ctl ipfs-cluster-ctl
|
2016-12-22 16:14:15 +00:00
|
|
|
|
2018-10-18 12:09:19 +00:00
|
|
|
gx-clean: clean
|
|
|
|
|
$(MAKE) -C $(deptools) gx-clean
|
|
|
|
|
|
|
|
|
|
gx:
|
|
|
|
|
$(MAKE) -C $(deptools) gx
|
2017-01-24 20:40:43 +00:00
|
|
|
|
2016-12-09 19:54:46 +00:00
|
|
|
deps: gx
|
2018-10-18 12:09:19 +00:00
|
|
|
$(gx) install --global
|
|
|
|
|
$(gx-go) rewrite
|
2017-04-18 22:24:23 +00:00
|
|
|
|
2018-09-07 02:08:17 +00:00
|
|
|
# Run this target before building the docker image
|
|
|
|
|
# and then gx won't attempt to pull all deps
|
|
|
|
|
# from the network each time
|
|
|
|
|
docker_deps: gx
|
2018-10-18 12:09:19 +00:00
|
|
|
$(gx) install --local
|
|
|
|
|
$(gx-go) rewrite
|
2018-09-07 02:08:17 +00:00
|
|
|
|
2017-12-06 12:56:21 +00:00
|
|
|
check:
|
|
|
|
|
go vet ./...
|
2017-12-19 17:05:32 +00:00
|
|
|
golint -set_exit_status -min_confidence 0.3 ./...
|
2017-12-06 12:56:21 +00:00
|
|
|
|
2016-12-08 16:20:16 +00:00
|
|
|
test: deps
|
2018-09-27 18:27:51 +00:00
|
|
|
go test -v ./...
|
2017-05-04 22:33:12 +00:00
|
|
|
|
|
|
|
|
test_sharness: $(sharness)
|
2017-04-28 03:20:29 +00:00
|
|
|
@sh sharness/run-sharness-tests.sh
|
2017-04-18 22:24:23 +00:00
|
|
|
|
2017-07-20 11:18:46 +00:00
|
|
|
test_problem: deps
|
2018-01-15 09:49:07 +00:00
|
|
|
go test -timeout 20m -loglevel "DEBUG" -v -run $(problematic_test)
|
2017-07-20 11:18:46 +00:00
|
|
|
|
2017-05-04 22:33:12 +00:00
|
|
|
$(sharness):
|
2017-05-05 16:09:36 +00:00
|
|
|
@echo "Downloading sharness"
|
2018-03-07 03:29:32 +00:00
|
|
|
@curl -L -s -o sharness/lib/sharness.tar.gz http://github.com/chriscool/sharness/archive/master.tar.gz
|
2017-05-05 16:09:36 +00:00
|
|
|
@cd sharness/lib; tar -zxf sharness.tar.gz; cd ../..
|
2017-05-04 22:33:12 +00:00
|
|
|
@mv sharness/lib/sharness-master sharness/lib/sharness
|
|
|
|
|
@rm sharness/lib/sharness.tar.gz
|
2017-04-28 03:20:29 +00:00
|
|
|
|
2017-04-18 22:24:23 +00:00
|
|
|
clean_sharness:
|
2017-04-28 03:20:29 +00:00
|
|
|
@rm -rf ./sharness/test-results
|
|
|
|
|
@rm -rf ./sharness/lib/sharness
|
|
|
|
|
@rm -rf sharness/trash\ directory*
|
2017-04-18 22:24:23 +00:00
|
|
|
|
2017-01-25 00:41:52 +00:00
|
|
|
rw: gx
|
2018-10-18 12:09:19 +00:00
|
|
|
$(gx-go) rewrite
|
2017-01-25 00:41:52 +00:00
|
|
|
rwundo: gx
|
2018-10-18 12:09:19 +00:00
|
|
|
$(gx-go) rewrite --undo
|
2016-12-08 16:20:16 +00:00
|
|
|
publish: rwundo
|
2018-10-18 12:09:19 +00:00
|
|
|
$(gx) publish
|
2018-01-04 20:41:16 +00:00
|
|
|
|
|
|
|
|
docker:
|
Feat: emancipate Consensus from the Cluster component
This commit promotes the Consensus component (and Raft) to become a fully
independent thing like other components, passed to NewCluster during
initialization. Cluster (main component) no longer creates the consensus
layer internally. This has triggered a number of breaking changes
that I will explain below.
Motivation: Future work will require the possibility of running Cluster
with a consensus layer that is not Raft. The "consensus" layer is in charge
of maintaining two things:
* The current cluster peerset, as required by the implementation
* The current cluster pinset (shared state)
While the pinset maintenance has always been in the consensus layer, the
peerset maintenance was handled by the main component (starting by the "peers"
key in the configuration) AND the Raft component (internally)
and this generated lots of confusion: if the user edited the peers in the
configuration they would be greeted with an error.
The bootstrap process (adding a peer to an existing cluster) and configuration
key also complicated many things, since the main component did it, but only
when the consensus was initialized and in single peer mode.
In all this we also mixed the peerstore (list of peer addresses in the libp2p
host) with the peerset, when they need not to be linked.
By initializing the consensus layer before calling NewCluster, all the
difficulties in maintaining the current implementation in the same way
have come to light. Thus, the following changes have been introduced:
* Remove "peers" and "bootstrap" keys from the configuration: we no longer
edit or save the configuration files. This was a very bad practice, requiring
write permissions by the process to the file containing the private key and
additionally made things like Puppet deployments of cluster difficult as
configuration would mutate from its initial version. Needless to say all the
maintenance associated to making sure peers and bootstrap had correct values
when peers are bootstrapped or removed. A loud and detailed error message has
been added when staring cluster with an old config, along with instructions on
how to move forward.
* Introduce a PeerstoreFile ("peerstore") which stores peer addresses: in
ipfs, the peerstore is not persisted because it can be re-built from the
network bootstrappers and the DHT. Cluster should probably also allow
discoverability of peers addresses (when not bootstrapping, as in that case
we have it), but in the meantime, we will read and persist the peerstore
addresses for cluster peers in this file, different from the configuration.
Note that dns multiaddresses are now fully supported and no IPs are saved
when we have DNS multiaddresses for a peer.
* The former "peer_manager" code is now a pstoremgr module, providing utilities
to parse, add, list and generally maintain the libp2p host peerstore, including
operations on the PeerstoreFile. This "pstoremgr" can now also be extended to
perform address autodiscovery and other things indepedently from Cluster.
* Create and initialize Raft outside of the main Cluster component: since we
can now launch Raft independently from Cluster, we have more degrees of
freedom. A new "staging" option when creating the object allows a raft peer to
be launched in Staging mode, waiting to be added to a running consensus, and
thus, not electing itself as leader or doing anything like we were doing
before. This additionally allows us to track when the peer has become a
Voter, which only happens when it's caught up with the state, something that
was wonky previously.
* The raft configuration now includes an InitPeerset key, which allows to
provide a peerset for new peers and which is ignored when staging==true. The
whole Raft initialization code is way cleaner and stronger now.
* Cluster peer bootsrapping is now an ipfs-cluster-service feature. The
--bootstrap flag works as before (additionally allowing comma-separated-list
of entries). What bootstrap does, is to initialize Raft with staging == true,
and then call Join in the main cluster component. Only when the Raft peer
transitions to Voter, consensus becomes ready, and cluster becomes Ready.
This is cleaner, works better and is less complex than before (supporting
both flags and config values). We also backup and clean the state whenever
we are boostrapping, automatically
* ipfs-cluster-service no longer runs the daemon. Starting cluster needs
now "ipfs-cluster-service daemon". The daemon specific flags (bootstrap,
alloc) are now flags for the daemon subcommand. Here we mimic ipfs ("ipfs"
does not start the daemon but print help) and pave the path for merging both
service and ctl in the future.
While this brings some breaking changes, it significantly reduces the
complexity of the configuration, the code and most importantly, the
documentation. It should be easier now to explain the user what is the
right way to launch a cluster peer, and more difficult to make mistakes.
As a side effect, the PR also:
* Fixes #381 - peers with dynamic addresses
* Fixes #371 - peers should be Raft configuration option
* Fixes #378 - waitForUpdates may return before state fully synced
* Fixes #235 - config option shadowing (no cfg saves, no need to shadow)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-04-28 22:22:23 +00:00
|
|
|
docker build -t cluster-image -f Dockerfile .
|
|
|
|
|
docker run --name tmp-make-cluster -d --rm cluster-image && sleep 4
|
|
|
|
|
docker exec tmp-make-cluster sh -c "ipfs-cluster-ctl version"
|
|
|
|
|
docker exec tmp-make-cluster sh -c "ipfs-cluster-service -v"
|
|
|
|
|
docker kill tmp-make-cluster
|
|
|
|
|
docker build -t cluster-image-test -f Dockerfile-test .
|
|
|
|
|
docker run --name tmp-make-cluster-test -d --rm cluster-image && sleep 8
|
|
|
|
|
docker exec tmp-make-cluster-test sh -c "ipfs-cluster-ctl version"
|
|
|
|
|
docker exec tmp-make-cluster-test sh -c "ipfs-cluster-service -v"
|
|
|
|
|
docker kill tmp-make-cluster-test
|
2018-01-04 20:41:16 +00:00
|
|
|
|
2018-09-21 18:07:05 +00:00
|
|
|
prcheck: deps check service ctl test
|
2018-09-19 04:35:43 +00:00
|
|
|
|
2018-01-04 20:41:16 +00:00
|
|
|
.PHONY: all gx deps test test_sharness clean_sharness rw rwundo publish service ctl install clean gx-clean docker
|
