PBM-1211 multiple endpoints to the same S3

pbm-functional/pytest/Dockerfile

@@ -55,6 +55,7 @@ COPY --from=x509 /etc/x509/ /etc/x509/
 COPY conf/supervisord.d/ /etc/supervisord.d/
 COPY conf/pbm/minio.yaml /etc/pbm.conf
 COPY conf/pbm/pbm-1043.yaml /etc/pbm-1043.conf
+COPY conf/pbm/pbm-1211.yaml /etc/pbm-1211.conf
 COPY conf/pbm/filesystem-profile.yaml /etc/pbm-fs-profile.conf
 COPY conf/krb5.conf /etc/krb5.conf
 COPY keyfile /etc/keyfile

pbm-functional/pytest/Dockerfile-nginx

@@ -1,3 +1,3 @@
 FROM nginx:stable-alpine
 COPY conf/nginx.conf /etc/nginx/nginx.conf
-EXPOSE 21114
+EXPOSE 21114 12111 12112

pbm-functional/pytest/conf/nginx.conf

@@ -30,9 +30,57 @@ http {
         POST            $binary_remote_addr;
     }
 
+    server {
+        listen       12111;
+        server_name  nginx-minio;
+
+        ignore_invalid_headers off;
+        client_max_body_size 0;
+        proxy_buffering off;
+        proxy_request_buffering off;
+
+        location / {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+
+            proxy_connect_timeout 300;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            chunked_transfer_encoding off;
+
+            proxy_pass http://minio:9000/;
+        }
+    }
+
+    server {
+        listen       12112;
+        server_name  nginx-minio;
+
+        ignore_invalid_headers off;
+        client_max_body_size 0;
+        proxy_buffering off;
+        proxy_request_buffering off;
+
+        location / {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+
+            proxy_connect_timeout 300;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            chunked_transfer_encoding off;
+
+            proxy_pass http://minio:9000/;
+        }
+    }
+
     server {
         listen       21114;
-        server_name  minio-nginx;
+        server_name  nginx-minio;
 
         ignore_invalid_headers off;
         client_max_body_size 0;

pbm-functional/pytest/conf/pbm/pbm-1211.yaml

@@ -0,0 +1,12 @@
+storage:
+  type: s3
+  s3:
+    endpointUrl: http://minio:9000
+    endpointUrlMap:
+      "rs101:27017": "http://nginx-minio:12111"
+      "rs201:27017": "http://nginx-minio:12112"
+    bucket: bcp
+    prefix: pbme2etest
+    credentials:
+      access-key-id: "minio1234"
+      secret-access-key: "minio1234"

pbm-functional/pytest/test_PBM-1211.py

@@ -0,0 +1,98 @@
+import pytest
+import pymongo
+import bson
+import testinfra
+import time
+import os
+import docker
+import threading
+
+from datetime import datetime
+from cluster import Cluster
+
+@pytest.fixture(scope="package")
+def config():
+    return { "mongos": "mongos",
+             "configserver":
+                            {"_id": "rscfg", "members": [{"host":"rscfg01"}]},
+             "shards":[
+                            {"_id": "rs1", "members": [{"host":"rs101"}]},
+                            {"_id": "rs2", "members": [{"host":"rs201"}]}
+                      ]}
+
+@pytest.fixture(scope="package")
+def cluster(config):
+    return Cluster(config)
+
+@pytest.fixture(scope="function")
+def start_cluster(cluster,request):
+    try:
+        cluster.destroy()
+        cluster.create()
+        result = cluster.exec_pbm_cli('config --file=/etc/pbm-1211.conf --out=json')
+        assert result.rc == 0
+        Cluster.log("Setup PBM:\n" + result.stdout)
+        time.sleep(5)
+        client=pymongo.MongoClient(cluster.connection)
+        client.admin.command("enableSharding", "test")
+        client.admin.command("shardCollection", "test.test", key={"_id": "hashed"})
+        yield True
+
+    finally:
+        if request.config.getoption("--verbose"):
+            cluster.get_logs()
+        cluster.destroy(cleanup_backups=True)
+
+@pytest.mark.timeout(900,func_only=True)
+@pytest.mark.parametrize('backup_type',['logical','physical'])
+def test_pitr_PBM_T268(start_cluster,cluster,backup_type):
+    def insert_docs():
+        client=pymongo.MongoClient(cluster.connection)
+        for i in range(1500):
+            client['test']['test'].insert_one({"doc":i})
+            time.sleep(0.1)
+
+    cluster.check_pbm_status()
+    base_backup=cluster.make_backup(backup_type)
+    cluster.enable_pitr(pitr_extra_args="--set pitr.oplogSpanMin=0.5")
+    Cluster.log("Start inserting docs in the background")
+    background_insert = threading.Thread(target=insert_docs)
+    background_insert.start()
+    time.sleep(60)
+    Cluster.log("Check if PITR is running")
+    if not cluster.check_pitr():
+        logs=cluster.exec_pbm_cli("logs -sD -t0")
+        assert False, logs.stdout
+    time.sleep(60)
+    background_insert.join()
+    time.sleep(30)
+    assert pymongo.MongoClient(cluster.connection)["test"]["test"].count_documents({}) == 1500
+    pitr = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S")
+    Cluster.log("Time for PITR is " + pitr)
+    time.sleep(60)
+    cluster.disable_pitr()
+    pymongo.MongoClient(cluster.connection).drop_database('test')
+    backup="--time=" + pitr
+    if backup_type == 'logical':
+        cluster.make_restore(backup, check_pbm_status=True)
+    else:
+        cluster.make_restore(backup, restart_cluster=True, check_pbm_status=True)
+    time.sleep(60)
+    assert pymongo.MongoClient(cluster.connection)["test"]["test"].count_documents({}) == 1500
+    assert pymongo.MongoClient(cluster.connection)["test"].command("collstats", "test").get("sharded", False)
+    Cluster.log("Finished successfully")
+
+@pytest.mark.timeout(600,func_only=True)
+def test_incremental_PBM_T269(start_cluster,cluster):
+    cluster.check_pbm_status()
+    cluster.make_backup("incremental --base")
+    client=pymongo.MongoClient(cluster.connection)
+    for i in range(1500):
+        client['test']['test'].insert_one({"doc":i})
+        time.sleep(0.1)
+    backup = cluster.make_backup("incremental")
+    pymongo.MongoClient(cluster.connection).drop_database('test')
+    cluster.make_restore(backup,restart_cluster=True, check_pbm_status=True)
+    assert pymongo.MongoClient(cluster.connection)["test"]["test"].count_documents({}) == 1500
+    assert pymongo.MongoClient(cluster.connection)["test"].command("collstats", "test").get("sharded", False)
+    Cluster.log("Finished successfully")