Skip to content

Commit

Permalink
Merge branch 'master' into 'feature/write-optimization'
Browse files Browse the repository at this point in the history
Bring in sync with master

See merge request dss/dss!10
  • Loading branch information
velomatt committed Jan 3, 2024
2 parents f2392a1 + 65d3104 commit 681d4a6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dss-ecosystem
Submodule dss-ecosystem updated 54 files
+20 −2 .github/workflows/main.yml
+3 −0 .gitignore
+50 −16 .gitlab-ci.yml
+3 −1 buildspec/datamover.yml
+8 −13 buildspec/dss-client.yml
+21 −0 buildspec/pytest.yml
+36 −0 buildspec/sonar-scanner.yml
+14 −0 dss_client/scripts/build.sh
+49 −0 dss_datamover/README.md
+32 −15 dss_datamover/client_application.py
+41 −9 dss_datamover/monitor.py
+10 −3 dss_datamover/socket_communication.py
+255 −0 dss_datamover/systemtests/conftest.py
+10 −0 dss_datamover/systemtests/pytest_config.json
+70 −0 dss_datamover/systemtests/test_client.py
+111 −0 dss_datamover/systemtests/test_datamover.py
+64 −0 dss_datamover/systemtests/test_nfs_cluster.py
+0 −38 dss_datamover/tests/README.md
+0 −181 dss_datamover/tests/conftest.py
+0 −5 dss_datamover/tests/pytest_config.json
+0 −58 dss_datamover/tests/test_datamover.py
+ dss_datamover/unittests/__pycache__/conftest.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_client_application.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_dss_client.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_logger.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_minio_client.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_monitor.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_nfs_cluster.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_s3_client.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_socket.cpython-36-pytest-7.0.1.pyc
+ dss_datamover/unittests/__pycache__/test_utils.cpython-36-pytest-7.0.1.pyc
+448 −0 dss_datamover/unittests/conftest.py
+67 −0 dss_datamover/unittests/pytest_config.json
+1 −0 dss_datamover/unittests/requirements.txt
+0 −0 dss_datamover/unittests/test_client_application.py
+0 −0 dss_datamover/unittests/test_dss_client.py
+105 −0 dss_datamover/unittests/test_indexing.py
+0 −0 dss_datamover/unittests/test_logger.py
+0 −0 dss_datamover/unittests/test_minio_client.py
+0 −0 dss_datamover/unittests/test_monitor.py
+0 −0 dss_datamover/unittests/test_nfs_cluster.py
+0 −0 dss_datamover/unittests/test_s3_client.py
+274 −0 dss_datamover/unittests/test_socket.py
+1 −8 dss_datamover/unittests/test_utils.py
+3 −0 dss_metrics/config/config.json
+62 −40 dss_metrics/metrics.py
+154 −0 dss_metrics/minio_rest_collector.py
+18 −10 dss_metrics/minio_ustat_collector.py
+0 −141 dss_metrics/nvmftarget_collector.py
+165 −0 dss_metrics/nvmftarget_ustat_collector.py
+2 −1 dss_metrics/requirements.txt
+2 −0 dss_metrics/whitelist.txt
+39 −11 dss_s3benchmark/README.md
+8 −0 dss_s3benchmark/dependencies.txt
1 change: 1 addition & 0 deletions scripts/docker/DSS.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN set -eux \
git \
glibc-devel \
gmp-devel \
golang \
jemalloc-devel \
Judy-devel \
libaio-devel \
Expand Down

0 comments on commit 681d4a6

Please sign in to comment.