Skip to content

[jl/CBK-828] Remove timeout behavior in publish_new_block() #73

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.

Sign up for GitHub

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

Open
PoOnesNerfect wants to merge 5 commits into
base: epic-CHRON-10383
Choose a base branch
from
Open

[jl/CBK-828] Remove timeout behavior in publish_new_block() #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51f74f9
Add epic branches to the CircleCI build filter (#66)
mexskican Jan 16, 2020
4ed953b
CBK-907 Quay + System test (#70)
Feb 4, 2020
cd6c945
updated rabbitmq_adapter/lapin_futures verion number
PoOnesNerfect Feb 4, 2020
fd0be3b
removed timeout behavior in publish_new_block()
PoOnesNerfect Feb 5, 2020
8ed1a63
remove commented lines
PoOnesNerfect Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ jobs:
libusb-dev -y
RUST_BACKTRACE=1 cargo test --package=parity-rabbitmq
no_output_timeout: 30m
deploy_docker_image:
image:
<<: *defaults
environment:
FINAL_IMAGE: registry.dev.infra.chronicled.com/blockchain-interface
QUAY_IMAGE: quay.io/chronicled/blockchain-interface
steps:
- add_ssh_keys:
fingerprints:
Expand All @@ -49,33 +50,53 @@ jobs:
- setup_remote_docker:
docker_layer_caching: false
version: 18.09.3
- run:
name: Setup Docker credentials
command: mkdir -p ~/.docker; echo -n "${REGISTRY_AUTH}" > ~/.docker/config.json;
- run:
name: Build docker image
command: |
export SHORT_COMMIT="$(echo $CIRCLE_SHA1 | cut -c1-7)";
export PREV_IMAGE=`docker images "${FINAL_IMAGE}:latest" --format "{{.Repository}}:{{.Tag}}" | head -n 1`;
export PREV_IMAGE=`docker images "${FINAL_IMAGE}:${CIRCLE_BRANCH}" --format "{{.Repository}}:{{.Tag}}" | head -n 1`;
ssh-add -L
docker build -c 1024 --rm=false -f scripts/docker/debian/Dockerfile --tag "${FINAL_IMAGE}:${SHORT_COMMIT}" --tag "${FINAL_IMAGE}:develop" --tag "${FINAL_IMAGE}:latest" . --cache-from="${PREV_IMAGE}" --ssh default;
docker build -c 1024 --rm=false -f scripts/docker/debian/Dockerfile --tag "${FINAL_IMAGE}:${SHORT_COMMIT}" --tag "${FINAL_IMAGE}:${CIRCLE_BRANCH}" --tag "${QUAY_IMAGE}:${SHORT_COMMIT}" --tag "${QUAY_IMAGE}:${CIRCLE_BRANCH}" . --cache-from="${PREV_IMAGE}" --ssh default;
no_output_timeout: 60m
- run:
name: Deploy to dockerhub
name: Deploy to dev registry
command: |
mkdir -p ~/.docker; echo -n "${REGISTRY_AUTH}" > ~/.docker/config.json;
SHORT_COMMIT="$(echo $CIRCLE_SHA1 | cut -c1-7)";
docker push "${FINAL_IMAGE}:${SHORT_COMMIT}";
docker push "${FINAL_IMAGE}:develop";
docker push "${FINAL_IMAGE}:latest";
docker logout;
docker push "${FINAL_IMAGE}:${CIRCLE_BRANCH}"
- run:
name: Deploy to quay
command: |
mkdir -p ~/.docker; echo -n "${QUAY_AUTH}" > ~/.docker/config.json;
SHORT_COMMIT="$(echo $CIRCLE_SHA1 | cut -c1-7)";
docker push "${QUAY_IMAGE}:${SHORT_COMMIT}";
docker push "${QUAY_IMAGE}:${CIRCLE_BRANCH}"

system_tests:
machine:
image: ubuntu-1604:201903-01
environment:
- FINAL_IMAGE: quay.io/chronicled/blockchain-interface
steps:
- run: mkdir -p ~/.docker ; echo -n "${QUAY_AUTH}" > ~/.docker/config.json
- run: SHORT_COMMIT="$(echo $CIRCLE_SHA1 | cut -c1-7)";
docker run quay.io/chronicled/c-rex
run-patch
--token "${CIRCLE_TOKEN}"
--origin-branch "${CIRCLE_BRANCH}"
--branch "develop"
--merge-origin-branch "develop"
blockchain blockchain "${FINAL_IMAGE}:${SHORT_COMMIT}"

workflows:
version: 2
blockchain-interface-workflow:
jobs:
- test
- deploy_docker_image:
- image:
requires:
- test
filters:
branches:
only: blockchain-interface
- system_tests:
requires:
- image
56 changes: 43 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rabbitmq/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ failure = "0.1.6"
futures = "0.1.6"
hex = "0.3.2"
hyper = "0.12"
lapin-futures = "0.28.1"
lapin-futures = { version = "0.28.3", registry = "chronicled-platform-v2" }
lazy_static = "1.4"
log = "0.4"
parking_lot = "0.7"
Expand All @@ -30,7 +30,7 @@ common-types = { path = "../ethcore/types" }
ethereum-types = "0.4"
futures-executor = "0.2.1"
parity-runtime = { path = "../util/runtime" }
rabbitmq_adaptor = { version = "0.4.3", registry = "chronicled-platform-v2" }
rabbitmq_adaptor = { version = "0.4.4", registry = "chronicled-platform-v2" }
rlp = { version = "0.3.0", features = ["ethereum"] }
vm = { path = "../ethcore/vm" }

Expand Down
2 changes: 0 additions & 2 deletions rabbitmq/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,6 @@ fn publish_new_block(
info!(target: LOG_TARGET, "Error publishing: {}", err);
handle_fatal_error(err);
})
.timeout(Duration::from_secs(10))
.map_err(|_| ())
.map(move |_| {
info!(target: LOG_TARGET, "Block message published: {:?}", block_number);
()
Expand Down