Skip to content

Commit 1405728

Browse files
Merge pull request #7884 from nimrod-becker/backport_to_5_15
Backport to 5.15.1 NS FS fixes
2 parents c17fe4d + a6a2ae6 commit 1405728

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3277
-1474
lines changed

.github/workflows/manual-build-rpm.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ on:
1515
options:
1616
- '8'
1717
- '9'
18+
architecture:
19+
type: choice
20+
description: 'Architecture (options: linux/amd64 or linux/ppc64le) - Optional, default is linux/amd64'
21+
default: 'linux/amd64'
22+
options:
23+
- 'linux/amd64'
24+
- 'linux/ppc64le'
1825

1926
jobs:
2027
manual-rpm-build-and-upload-artifact:
@@ -34,12 +41,25 @@ jobs:
3441
- name: Prepare CENTOS base image version
3542
id: centos_ver
3643
run: echo "centos_ver=${{ github.event.inputs.centos_ver }}" >> $GITHUB_OUTPUT
44+
45+
- name: Prepare linux architecture
46+
id: architecture
47+
run: |
48+
if [ "${{ github.event.inputs.architecture }}" == "linux/amd64" ]; then
49+
ARCH_SUFFIX="x86_64"
50+
echo "architecture=${ARCH_SUFFIX}" >> $GITHUB_OUTPUT
51+
elif [ "${{ github.event.inputs.architecture }}" == "linux/ppc64le" ]; then
52+
ARCH_SUFFIX="ppc64le"
53+
echo "architecture=${ARCH_SUFFIX}" >> $GITHUB_OUTPUT
54+
# enable cross-architecture builds
55+
docker run --privileged --rm tonistiigi/binfmt --install all
56+
fi
3757
3858
- name: Build RPM
3959
id: build_rpm
4060
run: |
4161
echo "Starting make rpm"
42-
make rpm CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }}
62+
make rpm CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }} CONTAINER_PLATFORM=${{ github.event.inputs.architecture }}
4363
echo "Make rpm completed"
4464
4565
- name: Finalize RPM
@@ -48,7 +68,8 @@ jobs:
4868
DATE=$(date +'%Y%m%d')
4969
VERSION=$(jq -r '.version' < ./package.json)
5070
CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }}
51-
RPM_SUFFIX=el${CENTOS_VER}.x86_64.rpm
71+
ARCH=${{ steps.architecture.outputs.architecture }}
72+
RPM_SUFFIX=el${CENTOS_VER}.${ARCH}.rpm
5273
RPM_BASE_VERSION=noobaa-core-${VERSION}-${DATE}
5374
RPM_FULL_PATH=${RPM_BASE_VERSION}-${{ github.event.inputs.branch }}${{ steps.suffix.outputs.suffix }}.${RPM_SUFFIX}
5475
echo "rpm_full_path=${RPM_FULL_PATH}"

config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ config.AGENT_TEST_CONNECTION_TIMEOUT = 1 * 60 * 1000;
9696
config.STORE_PERF_TEST_INTERVAL = 60 * 60 * 1000; // perform test_store_perf every 1 hour
9797
config.CLOUD_MAX_ALLOWED_IO_TEST_ERRORS = 3;
9898

99+
config.ENABLE_DEV_RANDOM_SEED = process.env.DISABLE_DEV_RANDOM_SEED === 'false' || false;
99100

100101
////////////////
101102
// RPC CONFIG //
@@ -722,6 +723,9 @@ config.NSFS_RENAME_RETRIES = 3;
722723
config.NSFS_VERSIONING_ENABLED = true;
723724
config.NSFS_UPDATE_ISSUES_REPORT_ENABLED = true;
724725

726+
config.NSFS_EXIT_EVENTS_TIME_FRAME_MIN = 24 * 60; // per day
727+
config.NSFS_MAX_EXIT_EVENTS_PER_TIME_FRAME = 10; // allow max 10 failed forks per day
728+
725729
config.NSFS_GLACIER_LOGS_DIR = '/var/run/noobaa-nsfs/wal';
726730
config.NSFS_GLACIER_LOGS_MAX_INTERVAL = 15 * 60 * 1000;
727731

docs/design/NonContainerizedNSFSDesign.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ node src/cmd/nsfs ../standalon/nsfs_root --config_dir ../standalon/fs_config
2727

2828
```json
2929
{
30+
"_id": "65cb1e7c9e6ae40d499c0ae3", // _id automatically generated
3031
"name": "user1",
3132
"email": "user1", // the email will be internally (the account name), email will not be set by user
3233
"creation_date": "2024-01-11T08:24:14.937Z",
@@ -41,8 +42,7 @@ node src/cmd/nsfs ../standalon/nsfs_root --config_dir ../standalon/fs_config
4142
"gid": 1001, //
4243
"new_buckets_path": "/",
4344
},
44-
"allow_bucket_creation": true,
45-
"_id": "65cb1e7c9e6ae40d499c0ae3" // _id automatically generated
45+
"allow_bucket_creation": true
4646
}
4747
```
4848

docs/dev_guide/NonContainerizedDeveloperCustomizations.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,23 @@ Example:
320320
```
321321

322322

323+
## 18. Disable random seeding -
324+
**Description -** This flag will enable the random seeding for the application.
325+
326+
**Configuration Key -** ENABLE_DEV_RANDOM_SEED
327+
328+
**Type -** boolean
329+
330+
**Default -** false
331+
**Steps -**
332+
```
333+
1. Open /path/to/config_dir/config.json file.
334+
2. Set the config key -
335+
Example:
336+
"ENABLE_DEV_RANDOM_SEED": false
337+
3. systemctl restart noobaa_nsfs
338+
```
339+
323340
## Config.json example
324341
```
325342
> cat /path/to/config_dir/config.json

0 commit comments

Comments
 (0)