Skip to content

Commit

Permalink
Merge pull request #7884 from nimrod-becker/backport_to_5_15
Browse files Browse the repository at this point in the history
Backport to 5.15.1 NS FS fixes
  • Loading branch information
nimrod-becker authored Mar 21, 2024
2 parents c17fe4d + a6a2ae6 commit 1405728
Show file tree
Hide file tree
Showing 52 changed files with 3,277 additions and 1,474 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/manual-build-rpm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ on:
options:
- '8'
- '9'
architecture:
type: choice
description: 'Architecture (options: linux/amd64 or linux/ppc64le) - Optional, default is linux/amd64'
default: 'linux/amd64'
options:
- 'linux/amd64'
- 'linux/ppc64le'

jobs:
manual-rpm-build-and-upload-artifact:
Expand All @@ -34,12 +41,25 @@ jobs:
- name: Prepare CENTOS base image version
id: centos_ver
run: echo "centos_ver=${{ github.event.inputs.centos_ver }}" >> $GITHUB_OUTPUT

- name: Prepare linux architecture
id: architecture
run: |
if [ "${{ github.event.inputs.architecture }}" == "linux/amd64" ]; then
ARCH_SUFFIX="x86_64"
echo "architecture=${ARCH_SUFFIX}" >> $GITHUB_OUTPUT
elif [ "${{ github.event.inputs.architecture }}" == "linux/ppc64le" ]; then
ARCH_SUFFIX="ppc64le"
echo "architecture=${ARCH_SUFFIX}" >> $GITHUB_OUTPUT
# enable cross-architecture builds
docker run --privileged --rm tonistiigi/binfmt --install all
fi
- name: Build RPM
id: build_rpm
run: |
echo "Starting make rpm"
make rpm CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }}
make rpm CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }} CONTAINER_PLATFORM=${{ github.event.inputs.architecture }}
echo "Make rpm completed"
- name: Finalize RPM
Expand All @@ -48,7 +68,8 @@ jobs:
DATE=$(date +'%Y%m%d')
VERSION=$(jq -r '.version' < ./package.json)
CENTOS_VER=${{ steps.centos_ver.outputs.centos_ver }}
RPM_SUFFIX=el${CENTOS_VER}.x86_64.rpm
ARCH=${{ steps.architecture.outputs.architecture }}
RPM_SUFFIX=el${CENTOS_VER}.${ARCH}.rpm
RPM_BASE_VERSION=noobaa-core-${VERSION}-${DATE}
RPM_FULL_PATH=${RPM_BASE_VERSION}-${{ github.event.inputs.branch }}${{ steps.suffix.outputs.suffix }}.${RPM_SUFFIX}
echo "rpm_full_path=${RPM_FULL_PATH}"
Expand Down
4 changes: 4 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ config.AGENT_TEST_CONNECTION_TIMEOUT = 1 * 60 * 1000;
config.STORE_PERF_TEST_INTERVAL = 60 * 60 * 1000; // perform test_store_perf every 1 hour
config.CLOUD_MAX_ALLOWED_IO_TEST_ERRORS = 3;

config.ENABLE_DEV_RANDOM_SEED = process.env.DISABLE_DEV_RANDOM_SEED === 'false' || false;

////////////////
// RPC CONFIG //
Expand Down Expand Up @@ -722,6 +723,9 @@ config.NSFS_RENAME_RETRIES = 3;
config.NSFS_VERSIONING_ENABLED = true;
config.NSFS_UPDATE_ISSUES_REPORT_ENABLED = true;

config.NSFS_EXIT_EVENTS_TIME_FRAME_MIN = 24 * 60; // per day
config.NSFS_MAX_EXIT_EVENTS_PER_TIME_FRAME = 10; // allow max 10 failed forks per day

config.NSFS_GLACIER_LOGS_DIR = '/var/run/noobaa-nsfs/wal';
config.NSFS_GLACIER_LOGS_MAX_INTERVAL = 15 * 60 * 1000;

Expand Down
4 changes: 2 additions & 2 deletions docs/design/NonContainerizedNSFSDesign.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ node src/cmd/nsfs ../standalon/nsfs_root --config_dir ../standalon/fs_config

```json
{
"_id": "65cb1e7c9e6ae40d499c0ae3", // _id automatically generated
"name": "user1",
"email": "user1", // the email will be internally (the account name), email will not be set by user
"creation_date": "2024-01-11T08:24:14.937Z",
Expand All @@ -41,8 +42,7 @@ node src/cmd/nsfs ../standalon/nsfs_root --config_dir ../standalon/fs_config
"gid": 1001, //
"new_buckets_path": "/",
},
"allow_bucket_creation": true,
"_id": "65cb1e7c9e6ae40d499c0ae3" // _id automatically generated
"allow_bucket_creation": true
}
```

Expand Down
17 changes: 17 additions & 0 deletions docs/dev_guide/NonContainerizedDeveloperCustomizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,23 @@ Example:
```


## 18. Disable random seeding -
**Description -** This flag will enable the random seeding for the application.

**Configuration Key -** ENABLE_DEV_RANDOM_SEED

**Type -** boolean

**Default -** false
**Steps -**
```
1. Open /path/to/config_dir/config.json file.
2. Set the config key -
Example:
"ENABLE_DEV_RANDOM_SEED": false
3. systemctl restart noobaa_nsfs
```

## Config.json example
```
> cat /path/to/config_dir/config.json
Expand Down
Loading

0 comments on commit 1405728

Please sign in to comment.