Skip to content

Commit d0f79f8

Browse files
sumeetchhetrisumeetchhetri
committed
Possible fix for failing pgsql wire sync tests
Fixed issues with failing mongodb tests (upgrade mongoc driver)
1 parent c4ed331 commit d0f79f8

File tree

62 files changed

+1490
-204
lines changed

Some content is hidden

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

62 files changed

+1490
-204
lines changed

‎.github/workflows/ci-macos.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
#brew unlink bazel
26-
brew install libpq openssl@1.1 ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja
26+
brew install libpq openssl@1.1 ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
2727
if [ -f /usr/local/lib/libssl.dylib ]; then
2828
sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
2929
fi
@@ -50,12 +50,12 @@ jobs:
5050
cmake -DCMAKE_INSTALL_PREFIX=/usr/local . && sudo make install
5151
cd /tmp
5252
rm -rf libcuckoo-master
53-
wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
54-
tar xf mongo-c-driver-1.4.2.tar.gz
55-
rm -f mongo-c-driver-1.4.2.tar.gz
56-
cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
57-
cd /tmp
58-
rm -rf mongo-c-driver-1.4.2
53+
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
54+
#tar xf mongo-c-driver-1.4.2.tar.gz
55+
#rm -f mongo-c-driver-1.4.2.tar.gz
56+
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
57+
#cd /tmp
58+
#rm -rf mongo-c-driver-1.4.2
5959
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
6060
tar xf v1.0.0.tar.gz
6161
rm -f v1.0.0.tar.gz

‎.github/workflows/ci-ubuntu.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v2
2020
- name: Install dependencies
2121
run: |
22-
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format ninja-build libjsoncpp-dev libboost-all-dev
22+
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format ninja-build libjsoncpp-dev libboost-all-dev libbson-dev libmongoc-dev
2323
sudo apt remove -y libsqlite3-dev
2424
#sudo apt-get install libseccomp-dev
2525
#git clone https://github.com/opencontainers/runc
@@ -34,12 +34,12 @@ jobs:
3434
cmake -DCMAKE_INSTALL_PREFIX=/usr . && sudo make install
3535
cd /tmp
3636
rm -rf libcuckoo-master
37-
wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
38-
tar xf mongo-c-driver-1.4.2.tar.gz
39-
rm -f mongo-c-driver-1.4.2.tar.gz
40-
cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
41-
cd /tmp
42-
rm -rf mongo-c-driver-1.4.2
37+
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
38+
#tar xf mongo-c-driver-1.4.2.tar.gz
39+
#rm -f mongo-c-driver-1.4.2.tar.gz
40+
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
41+
#cd /tmp
42+
#rm -rf mongo-c-driver-1.4.2
4343
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
4444
tar xf v1.0.0.tar.gz
4545
rm -f v1.0.0.tar.gz

‎.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
# uses a compiled language
6666

6767
- run: |
68-
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format-11 ninja-build libjsoncpp-dev libjansson-dev libc-ares-dev libboost-all-dev
68+
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format-11 ninja-build libjsoncpp-dev libjansson-dev libc-ares-dev libboost-all-dev libbson-dev libmongoc-dev
6969
pushd /tmp
7070
wget -q https://github.com/efficient/libcuckoo/archive/master.zip
7171
unzip master.zip
@@ -74,12 +74,12 @@ jobs:
7474
cmake -DCMAKE_INSTALL_PREFIX=/usr . && sudo make install
7575
cd /tmp
7676
rm -rf libcuckoo-master
77-
wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
78-
tar xf mongo-c-driver-1.4.2.tar.gz
79-
rm -f mongo-c-driver-1.4.2.tar.gz
80-
cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
81-
cd /tmp
82-
rm -rf mongo-c-driver-1.4.2
77+
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
78+
#tar xf mongo-c-driver-1.4.2.tar.gz
79+
#rm -f mongo-c-driver-1.4.2.tar.gz
80+
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
81+
#cd /tmp
82+
#rm -rf mongo-c-driver-1.4.2
8383
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
8484
tar xf v1.0.0.tar.gz
8585
rm -f v1.0.0.tar.gz

‎docker/all/benchmark_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
"display_name": "ffead-cpp-apache",
281281
"notes": "apache mongo",
282282
"versus": "",
283-
"tags": []
283+
"tags": ["broken"]
284284
},
285285
"mysql": {
286286
"json_url": "/t1/j",

‎docker/all/run_ffead.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,19 @@ then
191191
sed -i 's|/installs/ffead-cpp-7.0|'/installs/ffead-cpp-7.0-sql'|g' /etc/apache2/apache2.conf
192192
sed -i 's|/installs/ffead-cpp-7.0|'/installs/ffead-cpp-7.0-sql'|g' /etc/apache2/sites-enabled/000-default.conf /etc/apache2/sites-enabled/ffead-site.conf
193193
fi
194+
> /etc/apache2/mods-enabled/mpm_event.conf
195+
bash -c 'cat > /etc/apache2/mods-enabled/mpm_event.conf <<EOL
196+
<IfModule mpm_event_module>
197+
AsyncRequestWorkerFactor 2
198+
ThreadsPerChild 64
199+
ServerLimit 5
200+
StartServers 5
201+
MinSpareThreads 100
202+
MaxSpareThreads 200
203+
MaxRequestWorkers 320
204+
ListenBacklog 4096
205+
</IfModule>
206+
EOL'
194207
apachectl -D FOREGROUND
195208
elif [ "$2" = "nginx" ]
196209
then

‎docker/all/scripts/install_ffead-cpp-dependencies.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apt update -yqq && apt install --no-install-recommends -yqq autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev \
44
apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev lsb-release gnupg \
55
zlib1g-dev cmake make clang-format ninja-build libcurl4-openssl-dev git libpq-dev libpugixml-dev \
6-
wget build-essential pkg-config libpcre3-dev curl libgtk2.0-dev libgdk-pixbuf2.0-dev bison flex libreadline-dev
6+
wget build-essential pkg-config libpcre3-dev curl libgtk2.0-dev libgdk-pixbuf2.0-dev bison flex libreadline-dev libbson-dev libmongoc-dev
77
apt-get install --reinstall ca-certificates
88

99
wget -q https://repo.mysql.com/apt/ubuntu/pool/mysql-apt-config/m/mysql-apt-config/mysql-apt-config_0.8.29-1_all.deb
@@ -44,14 +44,14 @@ rm -rf libcuckoo
4444
#dpkg -i mysql-connector-odbc-setup_8.0.29-1ubuntu21.10_amd64.deb
4545
#rm -f *.deb
4646

47-
wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
48-
tar xf mongo-c-driver-1.4.2.tar.gz
49-
rm -f mongo-c-driver-1.4.2.tar.gz
50-
cd mongo-c-driver-1.4.2/ && \
51-
./configure --disable-automatic-init-and-cleanup && \
52-
make && make install
53-
cd $IROOT
54-
rm -rf mongo-c-driver-1.4.2
47+
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
48+
#tar xf mongo-c-driver-1.4.2.tar.gz
49+
#rm -f mongo-c-driver-1.4.2.tar.gz
50+
#cd mongo-c-driver-1.4.2/ && \
51+
# ./configure --disable-automatic-init-and-cleanup && \
52+
# make && make install
53+
#cd $IROOT
54+
#rm -rf mongo-c-driver-1.4.2
5555

5656
wget -q https://github.com/redis/hiredis/archive/v1.0.2.tar.gz
5757
tar xf v1.0.2.tar.gz

‎docker/all/scripts/install_ffead-cpp-framework.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
#Set the number of threads ---
3+
#Set the number of threads ----
44
MAX_THREADS=$(( 3 * `nproc` / 2 ))
55

66
WRIT_THREADS=$(( $MAX_THREADS / 3 ))

‎docker/all/scripts/install_ffead-cpp-httpd.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ EOL'
4747
#<IfModule mpm_event_module>
4848
# AsyncRequestWorkerFactor 2
4949
# ThreadsPerChild 64
50-
# ServerLimit 100
51-
# StartServers 20
50+
# ServerLimit 5
51+
# StartServers 5
5252
# MinSpareThreads 100
5353
# MaxSpareThreads 200
54+
# MaxRequestWorkers 320
5455
# ListenBacklog 4096
5556
#</IfModule>
5657
#EOL'

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN dnf config-manager --set-enabled crb
88
#RUN dnf config-manager --set-enabled remi
99
RUN dnf group install -y "Development Tools"
1010
RUN dnf install -y libmemcached-awesome libmemcached-awesome-devel
11-
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake
11+
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake mongo-c-driver-devel
1212

1313
#Install libcuckoo headers
1414
WORKDIR /tmp
@@ -39,12 +39,12 @@ WORKDIR /tmp
3939
RUN rm -rf redis-plus-plus-1.3.10
4040

4141
#Install mongodb c driver
42-
RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
43-
RUN tar xf mongo-c-driver-1.4.2.tar.gz
44-
RUN rm -f mongo-c-driver-1.4.2.tar.gz
45-
RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
46-
WORKDIR /tmp
47-
RUN rm -rf mongo-c-driver-1.4.2
42+
#RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
43+
#RUN tar xf mongo-c-driver-1.4.2.tar.gz
44+
#RUN rm -f mongo-c-driver-1.4.2.tar.gz
45+
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
46+
#WORKDIR /tmp
47+
#RUN rm -rf mongo-c-driver-1.4.2
4848

4949
#Install ffead-cpp
5050
WORKDIR /tmp

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp_autoconf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN dnf config-manager --set-enabled crb
88
RUN dnf config-manager --set-enabled remi
99
RUN dnf group install -y "Development Tools"
1010
RUN dnf install -y libmemcached-awesome libmemcached-awesome-devel
11-
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake
11+
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake mongo-c-driver-devel
1212

1313
#Install libcuckoo headers
1414
WORKDIR /tmp
@@ -39,12 +39,12 @@ WORKDIR /tmp
3939
RUN rm -rf redis-plus-plus-1.3.10
4040

4141
#Install mongodb c driver
42-
RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
43-
RUN tar xf mongo-c-driver-1.4.2.tar.gz
44-
RUN rm -f mongo-c-driver-1.4.2.tar.gz
45-
RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
46-
WORKDIR /tmp
47-
RUN rm -rf mongo-c-driver-1.4.2
42+
#RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
43+
#RUN tar xf mongo-c-driver-1.4.2.tar.gz
44+
#RUN rm -f mongo-c-driver-1.4.2.tar.gz
45+
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
46+
#WORKDIR /tmp
47+
#RUN rm -rf mongo-c-driver-1.4.2
4848

4949
#Install ffead-cpp
5050
WORKDIR /tmp

0 commit comments

Comments
 (0)