Skip to content

Commit f8b5d69

Browse files
authored
fix(interactive): Check nullptr for SesionLocalContext destruction (#4599)
- Check nullptr for `SesionLocalContext` destruction - Use ubuntu-22.04 since [ubuntu-20.04 is deprecated](actions/runner-images#11101) - Use neo4j 5.21.0, it is the oldest version of neo4j which could be successfully installed on ubuntu22, python 3.10
1 parent 89efa9d commit f8b5d69

18 files changed

+41
-37
lines changed

.github/workflows/build-graphscope-dev-images.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
jobs:
4545
build-graphscope-dev-wheel-image-amd64:
4646
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev_wheel == 'true') || (github.event_name == 'pull_request')
47-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4848
steps:
4949
- uses: actions/checkout@v4
5050
with:
@@ -76,7 +76,7 @@ jobs:
7676
7777
build-graphscope-dev-image-amd64:
7878
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.event_name == 'pull_request')
79-
runs-on: ubuntu-20.04
79+
runs-on: ubuntu-22.04
8080
steps:
8181
- uses: actions/checkout@v4
8282
with:
@@ -108,7 +108,7 @@ jobs:
108108
109109
build-vineyard-dev-image-amd64:
110110
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.event_name == 'pull_request')
111-
runs-on: ubuntu-20.04
111+
runs-on: ubuntu-22.04
112112
steps:
113113
- uses: actions/checkout@v4
114114
with:
@@ -141,7 +141,7 @@ jobs:
141141
build-vineyard-runtime-image-amd64:
142142
# only trigger this step in 'workflow_dispatch' event, since the 'vineyard-dev' image isn't actually pushed in 'pull_request'
143143
if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.build_vineyard_dev == 'true' }} || (github.event_name == 'pull_request')
144-
runs-on: ubuntu-20.04
144+
runs-on: ubuntu-22.04
145145
needs: [build-vineyard-dev-image-amd64]
146146
steps:
147147
- uses: actions/checkout@v4

.github/workflows/build-graphscope-images-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131

3232
jobs:
3333
build-image-x86-64:
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-22.04
3535

3636
steps:
3737
- uses: actions/checkout@v4
@@ -340,7 +340,7 @@ jobs:
340340
341341
342342
manifest-push-image:
343-
runs-on: ubuntu-20.04
343+
runs-on: ubuntu-22.04
344344
# if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope')
345345
if: false
346346
needs: [build-image-x86-64, build-image-aarch64]

.github/workflows/build-graphscope-manylinux-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
build-manylinux-image-amd64:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
steps:
2626
- uses: actions/checkout@v4
2727
with:

.github/workflows/build-graphscope-wheels-linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595

9696
build-wheels:
9797
if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
98-
runs-on: ubuntu-20.04
98+
runs-on: ubuntu-22.04
9999

100100
steps:
101101
- uses: actions/checkout@v4
@@ -175,7 +175,7 @@ jobs:
175175

176176
build-image:
177177
if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope')
178-
runs-on: ubuntu-20.04
178+
runs-on: ubuntu-22.04
179179
needs: [build-wheels]
180180

181181
steps:
@@ -242,7 +242,7 @@ jobs:
242242
243243
ubuntu-python-test:
244244
if: ${{ (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch') }}
245-
runs-on: ubuntu-20.04
245+
runs-on: ubuntu-22.04
246246
needs: [build-wheels]
247247
strategy:
248248
fail-fast: false
@@ -298,7 +298,7 @@ jobs:
298298
299299
centos-test:
300300
if: ${{ (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch') }}
301-
runs-on: ubuntu-20.04
301+
runs-on: ubuntu-22.04
302302
needs: [build-wheels]
303303
container:
304304
image: centos:8

.github/workflows/build-graphscope-wheels-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
# Action gh-action-pypi-publish not support non-linux os.
159159
publish-wheels:
160160
if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope')
161-
runs-on: ubuntu-20.04
161+
runs-on: ubuntu-22.04
162162
needs: [build-wheels, build-client-wheels]
163163
strategy:
164164
matrix:

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- "v*"
99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout Code
1414
uses: actions/checkout@v4

.github/workflows/interactive.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
jobs:
2727
build-interactive:
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-22.04
2929
if: ${{ github.repository == 'alibaba/GraphScope' }}
3030
container:
3131
image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64
@@ -68,7 +68,7 @@ jobs:
6868
6969
7070
test-hqps-engine:
71-
runs-on: ubuntu-20.04
71+
runs-on: ubuntu-22.04
7272
needs: build-interactive
7373
if: ${{ github.repository == 'alibaba/GraphScope' }}
7474
container:
@@ -421,7 +421,7 @@ jobs:
421421
422422
# test the different combination of cmake options: -DBUILD_TEST=ON/OFF, -DBUILD_ODPS_FRAGMENT_LOADER=ON/OFF
423423
test-cmake-options:
424-
runs-on: ubuntu-20.04
424+
runs-on: ubuntu-22.04
425425
container:
426426
image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64
427427
strategy:
@@ -441,7 +441,7 @@ jobs:
441441
sudo make -j4
442442
443443
test-AOCC-compilation:
444-
runs-on: ubuntu-20.04
444+
runs-on: ubuntu-22.04
445445
container:
446446
image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64
447447
steps:
@@ -469,7 +469,7 @@ jobs:
469469
sudo make -j4
470470
471471
test-flex:
472-
runs-on: ubuntu-20.04
472+
runs-on: ubuntu-22.04
473473
needs: build-interactive
474474
if: ${{ github.repository == 'alibaba/GraphScope' }}
475475
container:

.github/workflows/k8s-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
jobs:
4545
# JOB to run change detection
4646
changes:
47-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4848
# Set job outputs to values from filter step
4949
outputs:
5050
gae-python: ${{ steps.filter.outputs.gae-python }}

.github/workflows/local-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
jobs:
4545
# JOB to run change detection
4646
changes:
47-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4848
# Set job outputs to values from filter step
4949
outputs:
5050
gae-python: ${{ steps.filter.outputs.gae-python }}
@@ -266,7 +266,7 @@ jobs:
266266
retention-days: 5
267267

268268
mini-test:
269-
runs-on: ubuntu-20.04
269+
runs-on: ubuntu-22.04
270270
if: ${{ github.repository == 'alibaba/GraphScope' }}
271271
needs: [build-wheels]
272272
steps:
@@ -328,7 +328,7 @@ jobs:
328328
path: ~/.local/log/graphscope
329329

330330
python-unittest:
331-
runs-on: ubuntu-20.04
331+
runs-on: ubuntu-22.04
332332
if: ${{ github.repository == 'alibaba/GraphScope' }}
333333
needs: [build-wheels, changes]
334334
defaults:
@@ -398,7 +398,7 @@ jobs:
398398
verbose: true
399399

400400
networkx-basic-test:
401-
runs-on: ubuntu-20.04
401+
runs-on: ubuntu-22.04
402402
needs: [build-wheels, changes]
403403
if: ${{ github.repository == 'alibaba/GraphScope' }}
404404
defaults:
@@ -490,7 +490,7 @@ jobs:
490490
$(dirname $(python3 -c "import graphscope; print(graphscope.__file__)"))/nx/tests/convert
491491
492492
networkx-algo-and-generator-test:
493-
runs-on: ubuntu-20.04
493+
runs-on: ubuntu-22.04
494494
needs: [build-wheels, changes]
495495
if: ${{ github.repository == 'alibaba/GraphScope' }}
496496
strategy:

.github/workflows/networkx-forward-algo-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
forward-algo-test:
1414
if: ${{ github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope' }}
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616
defaults:
1717
run:
1818
shell: bash --noprofile --norc -eo pipefail {0}

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
make install INSTALL_PREFIX=/opt/graphscope
5959
6060
- name: Run Python Test
61-
if: matrix.os == 'ubuntu-20.04'
61+
if: matrix.os == 'ubuntu-22.04'
6262
env:
6363
FULL_TEST_SUITE: ON
6464
GS_TEST_DIR: ${{ github.workspace }}/gstest
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Upload Coverage
7373
uses: codecov/codecov-action@v4
74-
if: matrix.os == 'ubuntu-20.04'
74+
if: matrix.os == 'ubuntu-22.04'
7575
continue-on-error: true
7676
with:
7777
files: ./python/coverage.xml

.github/workflows/pegasus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
pegasus-build:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
steps:
2626
- uses: actions/checkout@v4
2727

.github/workflows/pr-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
PR-Check:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
permissions:
1212
pull-requests: write
1313

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
jobs:
2525
build-gsctl-wheel-package:
2626
if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope')
27-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-22.04
2828

2929
steps:
3030
- uses: actions/checkout@v4
@@ -218,7 +218,7 @@ jobs:
218218
219219
build-gss-image-amd64:
220220
if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope')
221-
runs-on: ubuntu-20.04
221+
runs-on: ubuntu-22.04
222222
steps:
223223
- uses: actions/checkout@v4
224224

@@ -282,7 +282,7 @@ jobs:
282282
push-gss-image-manifest:
283283
# if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope' }}
284284
if: false
285-
runs-on: ubuntu-20.04
285+
runs-on: ubuntu-22.04
286286

287287
needs: [build-gss-image-amd64, build-gss-image-arm64]
288288

@@ -314,7 +314,7 @@ jobs:
314314
315315
release-helm-charts:
316316
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope' }}
317-
runs-on: ubuntu-20.04
317+
runs-on: ubuntu-22.04
318318
steps:
319319
- uses: actions/checkout@v4
320320

flex/engines/graph_db/database/graph_db.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ struct SessionLocalContext {
4242
: thread_local_allocator_prefix(work_dir, thread_id))),
4343
logger(std::move(in_logger)),
4444
session(db, allocator, *logger, work_dir, thread_id) {}
45-
~SessionLocalContext() { logger->close(); }
45+
~SessionLocalContext() {
46+
if (logger) {
47+
logger->close();
48+
}
49+
}
4650
Allocator allocator;
4751
char _padding0[128 - sizeof(Allocator) % 128];
4852
std::unique_ptr<IWalWriter> logger;

k8s/dockerfiles/coordinator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ COPY ./interactive_engine/assembly/src/bin/graphscope/giectl /opt/graphscope/bin
6565
COPY ./k8s/utils/kube_ssh /usr/local/bin/kube_ssh
6666
RUN sudo chmod a+wrx /tmp
6767

68-
#to make sure neo4j==5.10.0 can be installed
68+
#to make sure neo4j==5.21.0 can be installed
6969
RUN pip3 install pip==20.3.4
7070

7171
USER graphscope

k8s/dockerfiles/learning.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN sudo apt-get update -y && \
4040

4141
RUN sudo chmod a+wrx /tmp
4242

43-
#to make sure neo4j==5.10.0 can be installed
43+
#to make sure neo4j==5.21.0 can be installed
4444
RUN pip3 install pip==20.3.4
4545

4646
COPY --from=builder /home/graphscope/install /opt/graphscope/

python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ grpcio-tools>=1.49
55
kubernetes>=24.2.0
66
msgpack>=1.0.5
77
mypy-protobuf>=3.4.0
8-
neo4j==5.10.0
8+
neo4j==5.21.0
99
nest_asyncio
1010
networkx==2.8.0;python_version>="3.8"
1111
networkx==2.6.0;python_version<"3.8"

0 commit comments

Comments
 (0)