Skip to content

PHPC-1029 Support maxTimeMS getMore option for tailable command cursors #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2017
Merged

PHPC-1029 Support maxTimeMS getMore option for tailable command cursors #673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa1eb0b
PHPC-1047: Add MongoDB 3.6 to test framework
derickr Nov 23, 2017
4c33808
PHPC-1029: Support maxTimeMS getMore option for tailable command cursors
derickr Nov 23, 2017
b3dcff2
Fixed tests, as they need MongoDB 3.6
derickr Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ URIs and resemble the following:
"STANDALONE_X509": "mongodb:\/\/C=US,ST=New York,L=New York City,O=MongoDB,OU=KernelUser,[email protected]:2300\/?authSource=$external&authMechanism=MONGODB-X509",
"STANDALONE_PLAIN": "mongodb:\/\/root:[email protected]:2400\/?authSource=admin",
"REPLICASET": "mongodb:\/\/192.168.112.10:3000,192.168.112.10:3001,192.168.112.10:3002\/?replicaSet=REPLICASET",
"REPLICASET_30": "mongodb:\/\/192.168.112.10:3100,192.168.112.10:3101,192.168.112.10:3102\/?replicaSet=REPLICASET_30"
"REPLICASET_30": "mongodb:\/\/192.168.112.10:3100,192.168.112.10:3101,192.168.112.10:3102\/?replicaSet=REPLICASET_30",
"REPLICASET_36": "mongodb:\/\/192.168.112.10:3200,192.168.112.10:3201,192.168.112.10:3202\/?replicaSet=REPLICASET_36"
}
```

Expand Down
71 changes: 71 additions & 0 deletions scripts/presets/replicaset-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"id": "REPLICASET_36",
"name": "mongod",
"members": [
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3200/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3200/mongod.log",
"journal": true,
"noprealloc": true,
"nssize": 1,
"port": 3200,
"smallfiles": true,
"setParameter": {"enableTestCommands": 1}
},
"rsParams": {
"priority": 99,
"tags": {
"ordinal": "one",
"dc": "pa"
}
},
"server_id": "RS-36-one"
},
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3201/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3201/mongod.log",
"journal": true,
"noprealloc": true,
"nssize": 1,
"port": 3201,
"smallfiles": true,
"setParameter": {"enableTestCommands": 1}
},
"rsParams": {
"priority": 1.1,
"tags": {
"ordinal": "two",
"dc": "nyc"
}
},
"server_id": "RS-36-two"
},
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3202/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3202/mongod.log",
"journal": true,
"noprealloc": true,
"nssize": 1,
"port": 3202,
"smallfiles": true,
"setParameter": {"enableTestCommands": 1}
},
"rsParams": {
"arbiterOnly": true

},
"server_id": "RS-36-arbiter"
}
],
"version": "36-release"
}

1 change: 1 addition & 0 deletions scripts/start-servers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function lap() {
"replicasets" => [
"scripts/presets/replicaset.json",
"scripts/presets/replicaset-30.json",
"scripts/presets/replicaset-36.json",
],
];

Expand Down
3 changes: 2 additions & 1 deletion scripts/ubuntu/mongo-orchestration-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"releases": {
"32-release": "/home/vagrant/3.2.0/usr/bin",
"30-release": "/home/vagrant/3.0.3/usr/bin",
"26-release": "/home/vagrant/2.6.9/usr/bin"
"26-release": "/home/vagrant/2.6.9/usr/bin",
"36-release": "/home/vagrant/3.6.0rc3/usr/bin"
}
}
10 changes: 7 additions & 3 deletions scripts/ubuntu/mongo-orchestration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,32 @@
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
# 3.2 key
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927
# testing key
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 58712A2291FA4AD5
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/3.2 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-3.2.list
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/3.0 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-3.0.list
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/2.6 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-2.6.list
echo 'deb http://repo.mongodb.com/apt/ubuntu precise/mongodb-enterprise/testing multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-testing.list
apt-get update

apt-get install -y libsnmp15 libgsasl7
apt-get install -y libsnmp15 libgsasl7 libcurl4-openssl-dev

sudo apt-get download mongodb-enterprise-server=3.2.0
sudo apt-get download mongodb-enterprise-mongos=3.2.0
sudo apt-get download mongodb-enterprise-server=3.0.3
sudo apt-get download mongodb-enterprise-server=2.6.9
sudo apt-get download mongodb-enterprise-server=3.6.0~rc3
dpkg -x mongodb-enterprise-server_2.6.9_amd64.deb 2.6.9
dpkg -x mongodb-enterprise-server_3.0.3_amd64.deb 3.0.3
dpkg -x mongodb-enterprise-server_3.2.0_amd64.deb 3.2.0
dpkg -x mongodb-enterprise-mongos_3.2.0_amd64.deb 3.2.0

dpkg -x mongodb-enterprise-server_3.6.0~rc3_amd64.deb 3.6.0rc3


# Python stuff for mongo-orchestration
apt-get install -y python python-dev python-pip

pip install --upgrade 'git+https://github.com/10gen/mongo-orchestration.git#egg=mongo_orchestration'
pip install --index-url=https://pypi.python.org/simple/ --upgrade 'git+https://github.com/10gen/mongo-orchestration.git#egg=mongo_orchestration'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The installed pip defaults to "http://pypi.python.org/simple/" which no longer works as it just returns "SSL is required"


# Launch mongo-orchestration
mongo-orchestration -f mongo-orchestration-config.json -b 192.168.112.10 --enable-majority-read-concern start
Expand Down
1 change: 1 addition & 0 deletions tests/utils/basic.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ $servers = array(
"STANDALONE_PLAIN" => "",
"REPLICASET" => "",
"REPLICASET_30" => "",
"REPLICASET_36" => "",
);
$servers = array_merge($servers, $config);
def($servers);
Expand Down