Fixed broken ffead-cpp builds (#5367)

* Fixed broken builds

* Added fix for failing nginx/apache tests

* Disabled failing apache mongo build

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -22,7 +22,7 @@
 			"display_name": "ffead-cpp-mongo",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"mysql": {
 			"json_url": "/te-benchmark/json",
@@ -45,7 +45,7 @@
 			"display_name": "ffead-cpp-mysql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"postgresql": {
 			"json_url": "/te-benchmark/json",
@@ -68,7 +68,7 @@
 			"display_name": "ffead-cpp-postgresql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"apache-mongo": {
 			"json_url": "/te-benchmark/json",
@@ -114,7 +114,7 @@
 			"display_name": "ffead-cpp-apache-mysql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"apache-postgresql": {
 			"json_url": "/te-benchmark/json",
@@ -137,7 +137,7 @@
 			"display_name": "ffead-cpp-apache-postgresql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"nginx-mongo": {
 			"json_url": "/te-benchmark/json",
@@ -160,7 +160,7 @@
 			"display_name": "ffead-cpp-nginx-mongo",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"nginx-mysql": {
 			"json_url": "/te-benchmark/json",
@@ -183,7 +183,7 @@
 			"display_name": "ffead-cpp-nginx-mysql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"nginx-postgresql": {
 			"json_url": "/te-benchmark/json",
@@ -206,7 +206,7 @@
 			"display_name": "ffead-cpp-nginx-postgresql",
 			"notes": "",
 			"versus": "",
-			"tags": ["broken"]
+			"tags": []
 		},
 		"redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -226,7 +226,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		},
 		"nginx-redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -246,7 +246,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		},
 		"apache-redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -266,7 +266,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		},
 		"memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -286,7 +286,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		},
 		"nginx-memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -306,7 +306,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		},
 		"apache-memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -326,7 +326,7 @@
 			"notes": "",
 			"versus": "",
 			"wait_before_sending_requests": 10,
-			"tags": ["broken"]
+			"tags": []
 		}
 	}]
 }

frameworks/C++/ffead-cpp/install_ffead-cpp-framework.sh

@@ -22,7 +22,6 @@ cd $IROOT
 wget -q https://github.com/sumeetchhetri/ffead-cpp/archive/master.zip
 unzip master.zip
 mv ffead-cpp-master ffead-cpp-src
-mv ${TROOT}/ffead-cpp-src ffead-cpp-src
 cd ffead-cpp-src/
 
 chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
@@ -94,6 +93,13 @@ cd ${IROOT}/ffead-cpp-src/
 cp -rf ffead-cpp-3.0-bin ${IROOT}/ffead-cpp-3.0
 rm -rf ffead-cpp-3.0-bin
 
+ln -s ${IROOT}/ffead-cpp-3.0/lib/libte_benchmark.so /usr/local/lib/libte_benchmark.so
+ln -s ${IROOT}/ffead-cpp-3.0/lib/libffead-modules.so /usr/local/lib/libffead-modules.so
+ln -s ${IROOT}/ffead-cpp-3.0/lib/libffead-framework.so /usr/local/lib/libffead-framework.so
+ln -s ${IROOT}/ffead-cpp-3.0/lib/libinter.so /usr/local/lib/libinter.so
+ln -s ${IROOT}/ffead-cpp-3.0/lib/libdinter.so /usr/local/lib/libdinter.so
+ldconfig
+
 cd ${IROOT}/ffead-cpp-3.0
 cp -f ${TROOT}/run_ffead.sh ./
 

frameworks/C++/ffead-cpp/install_ffead-cpp-httpd.sh

@@ -49,15 +49,28 @@ export ODBCINI='"$IROOT"'/odbc.ini
 export ODBCSYSINI='"$IROOT"' 
 EOL'
 
-bash -c 'cat > /etc/apache2/mods-enabled/mpm_event.conf <<EOL
-<IfModule mpm_event_module>
-    AsyncRequestWorkerFactor   2
-    ThreadsPerChild           64
-    ServerLimit              100
-    StartServers              20
-    MinSpareThreads          100
-    MaxSpareThreads          200
-    ListenBacklog 			4096
+#bash -c 'cat > /etc/apache2/mods-enabled/mpm_event.conf <<EOL
+#<IfModule mpm_event_module>
+#    AsyncRequestWorkerFactor   2
+#    ThreadsPerChild           64
+#    ServerLimit              100
+#    StartServers              20
+#    MinSpareThreads          100
+#    MaxSpareThreads          200
+#    ListenBacklog 			4096
+#</IfModule>
+#EOL'
+
+bash -c 'cat > /etc/apache2/mods-enabled/mpm_worker.conf <<EOL
+<IfModule mpm_worker_module>
+    ServerLimit              250
+    StartServers              10
+    MinSpareThreads           75
+    MaxSpareThreads          250 
+    ThreadLimit               64
+    ThreadsPerChild           32
+    MaxRequestWorkers       8000
+    MaxConnectionsPerChild 10000
 </IfModule>
 EOL'