Skip to content

fix: use improved ps addr patch #172

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
ctrox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use improved ps addr patch #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/workflows/build_push_criu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Build and Publish CRIU image

on:
push:
branches:
- main
paths:
- criu/**

Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ SHIM_EXTLDFLAGS="-static" -s -w
SHIM_TAGS="no_grpc"
SHIM_LDFLAGS=-X $(CONTAINERD_PKG)/version.Version=$(VERSION) -X $(CONTAINERD_PKG)/version.Revision=$(REVISION) -X $(CONTAINERD_PKG)/version.Package=$(PKG) -extldflags ${SHIM_EXTLDFLAGS}
GOARCH ?= $(shell go env GOARCH)
PLATFORMS := linux/arm64,linux/amd64

# build-kind can be used for fast local development. It just builds and
# switches out the shim binary. Running pods have to be recreated to make use
Expand All @@ -41,7 +42,7 @@ logs:
docker exec kind-worker journalctl -fu containerd & docker exec kind-worker2 journalctl -fu containerd

build-criu:
docker buildx build --push --platform linux/arm64,linux/amd64 --build-arg CRIU_VERSION=$(CRIU_VERSION) -t $(CRIU_IMAGE) -f criu/Dockerfile .
docker buildx build --push --platform $(PLATFORMS) --build-arg CRIU_VERSION=$(CRIU_VERSION) -t $(CRIU_IMAGE) -f criu/Dockerfile .

build-installer:
docker build --load -t $(INSTALLER_IMAGE) -f cmd/installer/Dockerfile .
Expand Down
20 changes: 16 additions & 4 deletions criu/rpc-ps-address.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
diff --git a/criu/cr-service.c b/criu/cr-service.c
index deb16e553..f86f0e334 100644
index dccf4ef38c..b3ba7f03f0 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -598,6 +598,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)

@@ -554,12 +554,15 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
if (req->ps) {
opts.port = (short)req->ps->port;
+ opts.addr = req->ps->address;

+ if (req->ps->address) {
+ SET_CHAR_OPTS(addr, req->ps->address);
+ } else {
+ xfree(opts.addr);
+ opts.addr = NULL;
+ }
+
if (!opts.lazy_pages) {
opts.use_page_server = true;
- if (req->ps->address)
- SET_CHAR_OPTS(addr, req->ps->address);
- else
- opts.addr = NULL;

if (req->ps->has_fd) {
if (!opts.swrk_restore)
Loading