From 75bba206221cb6a3595cb5f7ba75108964c19138 Mon Sep 17 00:00:00 2001
From: Sumeet Chhetri <sumeet.chhetri@gmail.com>
Date: Sat, 10 Apr 2021 12:47:34 +0530
Subject: [PATCH] Fixed issues in Cache initialization routes with async libpq
 modes Server should start listening to requests only when both cache/database
 init routines are complete [docker_compare][skip_build]

---
 .cproject                                     |  11 +-
 .github/workflows/ci-docker-tfb-test.yml      |   2 +-
 .github/workflows/ci-macos.yml                |  16 +--
 CMakeLists.txt                                |   1 +
 docker/benchmark_compare.json                 |  18 ---
 ...raw-async-clibpqb-profiled-base.dockerfile |  10 +-
 ...cpp-sql-raw-async-profiled-base.dockerfile |   5 +-
 ...p-sql-raw-clibpqb-profiled-base.dockerfile |   5 +-
 ...ffead-cpp-sql-raw-profiled-base.dockerfile |   5 +-
 docker/techempower-config/run_ffead.sh        |   4 -
 .../sql-async-profiled-install-clang-dbg.sh   |  42 +------
 .../sql-async-profiled-install-clang.sh       |  41 -------
 .../sql-async-profiled-install.sh             |  38 ------
 .../sql-profiled-install-clang.sh             |  40 -------
 .../sql-profiled-install.sh                   |  38 ------
 .../techempower-config/sql-profiled-util.sh   |  54 +++++++++
 src/framework/ConfigurationHandler.cpp        |   6 +-
 src/framework/DCPGenerator.cpp                |   2 +-
 src/framework/ServiceTask.cpp                 |   4 +-
 src/framework/TemplateGenerator.cpp           |   2 +-
 src/modules/cache/CacheInterface.h            |   2 +-
 src/modules/cache/CacheManager.cpp            |  26 +++++
 src/modules/cache/CacheManager.h              |   3 +
 src/modules/cache/memcached/MemcachedImpl.cpp |   2 +-
 src/modules/cache/memcached/MemcachedImpl.h   |   2 +-
 src/modules/cache/memory/MemoryCacheImpl.cpp  |   2 +-
 src/modules/cache/memory/MemoryCacheImpl.h    |   2 +-
 src/modules/cache/redis/RedisCacheImpl.cpp    |   5 +-
 src/modules/cache/redis/RedisCacheImpl.h      |   2 +-
 src/modules/common/AppDefines.xmake.h.in      |  90 ++++++++++++++
 src/modules/common/Compatibility.cpp          |   6 +
 src/modules/common/Compatibility.h            |   4 +
 src/modules/common/Logger.cpp                 |  18 +--
 src/modules/common/Logger.h                   |  12 +-
 src/modules/http/HttpResponse.cpp             |   2 +-
 src/modules/http/HttpSession.cpp              |   2 +-
 src/modules/ioc/FFEADContext.cpp              |   4 +-
 src/modules/sdorm/DataSourceManager.cpp       |  26 +++++
 src/modules/sdorm/DataSourceManager.h         |   3 +
 .../sdorm/sql/libpq/LibpqDataSourceImpl.cpp   | 110 +++++++++++-------
 .../sdorm/sql/libpq/LibpqDataSourceImpl.h     |   4 +-
 src/modules/server-util/NBServer.cpp          |   2 +-
 .../server-util/RequestReaderHandler.cpp      |  26 ++++-
 .../server-util/RequestReaderHandler.h        |   3 +-
 src/modules/server-util/SelEpolKqEvPrt.cpp    |  11 +-
 src/modules/server-util/SelEpolKqEvPrt.h      |   2 +-
 src/modules/server-util/SocketInterface.h     |   2 +-
 src/server/embedded/CHServer.cpp              |  60 +++++-----
 src/server/embedded/CHServer.h                |   3 +
 web/te-benchmark-um-mgr/src/TeBkUmMgr.cpp     |   1 +
 .../include/TeBkUmLpqAsync.h                  |   5 +-
 .../src/TeBkUmLpqAsync.cpp                    |  10 +-
 web/te-benchmark-um-pq/src/TeBkUmLpq.cpp      |   1 +
 web/te-benchmark-um/src/TeBkUm.cpp            |   1 +
 web/te-benchmark/src/TeBkRestController.cpp   |   1 +
 55 files changed, 429 insertions(+), 370 deletions(-)
 create mode 100644 docker/techempower-config/sql-profiled-util.sh
 create mode 100644 src/modules/common/AppDefines.xmake.h.in

diff --git a/.cproject b/.cproject
index 532659e65..86b964e0b 100644
--- a/.cproject
+++ b/.cproject
@@ -42,6 +42,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base.342787389" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1062586156" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="/usr/local/opt/libpq/include"/>
+									<listOptionValue builtIn="false" value="/usr/local/Cellar/vcpkg/2020.11-1/libexec/installed/x64-osx/include/"/>
 									<listOptionValue builtIn="false" value="/usr/local/opt/emsdk/upstream/emscripten/system/include"/>
 									<listOptionValue builtIn="false" value="/Users/sumeetc/Projects/GitHub/fmt/include/"/>
 									<listOptionValue builtIn="false" value="/Users/sumeetc/Projects/GitHub/seastar/include/"/>
@@ -59,6 +60,7 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.228093075" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__cplusplus=201103L"/>
+									<listOptionValue builtIn="false" value="RAPIDJSON_HAS_STDSTRING=1"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.optimization.level.392374030" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.option.debugging.level.1405958163" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
@@ -167,5 +169,12 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/ffead-cpp"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/ffead-cpp"/>
+		</configuration>
+	</storageModule>
 </cproject>
\ No newline at end of file
diff --git a/.github/workflows/ci-docker-tfb-test.yml b/.github/workflows/ci-docker-tfb-test.yml
index 7edf74d64..cbb7c434d 100644
--- a/.github/workflows/ci-docker-tfb-test.yml
+++ b/.github/workflows/ci-docker-tfb-test.yml
@@ -19,4 +19,4 @@ jobs:
         cp -rf docker/techempower-config/* FrameworkBenchmarks/frameworks/C++/ffead-cpp/
         cd FrameworkBenchmarks
         #sed -i'' -e 's|apt-get -yqq install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postgresql postgresql-contrib|apt-get -yqq install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postgresql-12 postgresql-contrib-12|g' toolset/databases/postgres/postgres.dockerfile
-        ./tfb --mode verify --test ffead-cpp
+        ./tfb --mode verify --test-dir C++/ffead-cpp
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 67d6ffe69..94f76a996 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -57,18 +57,6 @@ jobs:
         cd hiredis-1.0.0/
         cmake . && sudo make install
         rm -rf hiredis-1.0.0
-        git clone https://github.com/sumeetchhetri/cinatra.git
-        cd cinatra
-        git checkout sum_master
-        cd /tmp
-        git clone --recurse-submodules https://github.com/sumeetchhetri/drogon
-        cd  drogon
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release ..
-        make && sudo make install
-        cd /tmp
-        rm -rf drogon
         popd
 
     - name: Install ffead-cpp
@@ -107,6 +95,8 @@ jobs:
         done
         echo "ffead-cpp start successful"
         sleep 5
-        cd tests && chmod +x *.sh && ./runTests.sh
+        cd tests
+        sudo chmod +x *.sh
+        sudo ./runTests.sh
         echo "ffead-cpp normal shutdown"
         sudo pkill ffead-cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac281d673..1c98693ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,7 @@ if(DEBUG)
 	#if (APPLE)
 	#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 	#endif()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_DEBUG")
 else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 endif(DEBUG)
diff --git a/docker/benchmark_compare.json b/docker/benchmark_compare.json
index 859ce785d..8005ff06e 100644
--- a/docker/benchmark_compare.json
+++ b/docker/benchmark_compare.json
@@ -5,10 +5,7 @@
 			"json_url": "/te-benchmark-um-pq/json",
 			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -26,13 +23,10 @@
 			"tags": []
 		},
 		"postgresql-raw52": {
-			"json_url": "/te-benchmark-um-pq/json",
-			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq/db",
 			"query_url": "/te-benchmark-um-pq/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq/fortunes",
 			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -92,13 +86,10 @@
 			"tags": []
 		},
 		"postgresql-raw-async52": {
-			"json_url": "/te-benchmark-um-pq-async/json",
-			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq-async/db",
 			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
 			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq-async/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -161,10 +152,7 @@
 			"json_url": "/te-benchmark-um-pq/json",
 			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -182,13 +170,10 @@
 			"tags": []
 		},
 		"postgresql-raw53": {
-			"json_url": "/te-benchmark-um-pq/json",
-			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq/db",
 			"query_url": "/te-benchmark-um-pq/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq/fortunes",
 			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -248,13 +233,10 @@
 			"tags": []
 		},
 		"postgresql-raw-async53": {
-			"json_url": "/te-benchmark-um-pq-async/json",
-			"plaintext_url": "/plaintext",
 			"db_url": "/te-benchmark-um-pq-async/db",
 			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
 			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
 			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq-async/cached-worlds?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
diff --git a/docker/techempower-config/ffead-cpp-sql-raw-async-clibpqb-profiled-base.dockerfile b/docker/techempower-config/ffead-cpp-sql-raw-async-clibpqb-profiled-base.dockerfile
index af07ab8e0..79c299e00 100644
--- a/docker/techempower-config/ffead-cpp-sql-raw-async-clibpqb-profiled-base.dockerfile
+++ b/docker/techempower-config/ffead-cpp-sql-raw-async-clibpqb-profiled-base.dockerfile
@@ -79,7 +79,15 @@ ENV accept accept
 
 WORKDIR ${IROOT}
 
+COPY sql-profiled-util.sh ${IROOT}/
+RUN chmod 755 ${IROOT}/sql-profiled-util.sh
+RUN ./sql-profiled-util.sh batch clang async
+
+#COPY TeBkUmLpqAsync.cpp ${IROOT}/ffead-cpp-src/web/te-benchmark-um-pq-async/src/
+#COPY TeBkUmLpqAsync.h ${IROOT}/ffead-cpp-src/web/te-benchmark-um-pq-async/include/
+#COPY LibpqDataSourceImpl.cpp ${IROOT}/ffead-cpp-src/src/modules/sdorm/sql/libpq/
+#COPY LibpqDataSourceImpl.h ${IROOT}/ffead-cpp-src/src/modules/sdorm/sql/libpq/
+
 COPY sql-async-profiled-install-clang.sh install_ffead-cpp-sql-raw-profiled.sh ${IROOT}/
 RUN chmod 755 ${IROOT}/sql-async-profiled-install-clang.sh ${IROOT}/install_ffead-cpp-sql-raw-profiled.sh
-
 RUN ./sql-async-profiled-install-clang.sh batch
diff --git a/docker/techempower-config/ffead-cpp-sql-raw-async-profiled-base.dockerfile b/docker/techempower-config/ffead-cpp-sql-raw-async-profiled-base.dockerfile
index f1856742c..ef114dce4 100644
--- a/docker/techempower-config/ffead-cpp-sql-raw-async-profiled-base.dockerfile
+++ b/docker/techempower-config/ffead-cpp-sql-raw-async-profiled-base.dockerfile
@@ -79,7 +79,10 @@ ENV accept accept
 
 WORKDIR ${IROOT}
 
+COPY sql-profiled-util.sh ${IROOT}/
+RUN chmod 755 ${IROOT}/sql-profiled-util.sh
+RUN ./sql-profiled-util.sh nobatch noclang async
+
 COPY sql-async-profiled-install.sh install_ffead-cpp-sql-raw-profiled.sh ${IROOT}/
 RUN chmod 755 ${IROOT}/sql-async-profiled-install.sh ${IROOT}/install_ffead-cpp-sql-raw-profiled.sh
-
 RUN ./sql-async-profiled-install.sh
diff --git a/docker/techempower-config/ffead-cpp-sql-raw-clibpqb-profiled-base.dockerfile b/docker/techempower-config/ffead-cpp-sql-raw-clibpqb-profiled-base.dockerfile
index 5d67334e9..dea0fdd1c 100644
--- a/docker/techempower-config/ffead-cpp-sql-raw-clibpqb-profiled-base.dockerfile
+++ b/docker/techempower-config/ffead-cpp-sql-raw-clibpqb-profiled-base.dockerfile
@@ -79,7 +79,10 @@ ENV accept accept
 
 WORKDIR ${IROOT}
 
+COPY sql-profiled-util.sh ${IROOT}/
+RUN chmod 755 ${IROOT}/sql-profiled-util.sh
+RUN ./sql-profiled-util.sh batch clang noasync
+
 COPY sql-profiled-install-clang.sh install_ffead-cpp-sql-raw-profiled.sh ${IROOT}/
 RUN chmod 755 ${IROOT}/sql-profiled-install-clang.sh ${IROOT}/install_ffead-cpp-sql-raw-profiled.sh
-
 RUN ./sql-profiled-install-clang.sh batch
diff --git a/docker/techempower-config/ffead-cpp-sql-raw-profiled-base.dockerfile b/docker/techempower-config/ffead-cpp-sql-raw-profiled-base.dockerfile
index a195fec57..ac4f6e3cc 100644
--- a/docker/techempower-config/ffead-cpp-sql-raw-profiled-base.dockerfile
+++ b/docker/techempower-config/ffead-cpp-sql-raw-profiled-base.dockerfile
@@ -79,7 +79,10 @@ ENV accept accept
 
 WORKDIR ${IROOT}
 
+COPY sql-profiled-util.sh ${IROOT}/
+RUN chmod 755 ${IROOT}/sql-profiled-util.sh
+RUN ./sql-profiled-util.sh nobatch noclang noasync
+
 COPY sql-profiled-install.sh install_ffead-cpp-sql-raw-profiled.sh ${IROOT}/
 RUN chmod 755 ${IROOT}/sql-profiled-install.sh ${IROOT}/install_ffead-cpp-sql-raw-profiled.sh
-
 RUN ./sql-profiled-install.sh
diff --git a/docker/techempower-config/run_ffead.sh b/docker/techempower-config/run_ffead.sh
index 5b23f6023..eefdae240 100644
--- a/docker/techempower-config/run_ffead.sh
+++ b/docker/techempower-config/run_ffead.sh
@@ -107,10 +107,6 @@ then
 	for i in $(seq 0 $(($(nproc --all)-1))); do
 		taskset -c $i ./ffead-cpp $FFEAD_CPP_PATH &
 	done
-	if [ "$3" = "postgresql-raw-async" ]
-	then
-		sleep 20
-	fi
 elif [ "$2" = "lithium" ]
 then
 	./ffead-cpp-lithium $FFEAD_CPP_PATH &
diff --git a/docker/techempower-config/sql-async-profiled-install-clang-dbg.sh b/docker/techempower-config/sql-async-profiled-install-clang-dbg.sh
index f1907c47c..23c779877 100644
--- a/docker/techempower-config/sql-async-profiled-install-clang-dbg.sh
+++ b/docker/techempower-config/sql-async-profiled-install-clang-dbg.sh
@@ -1,44 +1,4 @@
-mkdir /tmp/profile-data
-
-rm -rf $IROOT/ffead-cpp-5.0-sql
-
-if [ "$1" = "batch" ]
-then
-	apt remove -yqq libpq-dev
-	apt autoremove -yqq
-	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
-	apt update && apt install -y bison flex libreadline-dev
-	cd /tmp
-	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
-	#tar -xzf batch_mode_ubuntu.tar.gz
-	#cd postgres-batch_mode_ubuntu
-	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
-	#make && make install
-	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
-	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
-	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
-	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
-	git apply ./v22-0001-libpq-batch.patch
-	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
-	cd src/interfaces/libpq
-	make all install -j4
-	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
-fi
-
-apt update -yqq && apt install -yqq clang
-
 cd $IROOT/ffead-cpp-src/
-rm -rf CMakeCache.txt CMakeFiles
-rm -rf web/te-benchmark-um web/te-benchmark-um-mgr web/te-benchmark-um-pq
-
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq/libte_benchmark_um_pq${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-
-sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq-async/config/sdorm.xml
 
 rm -rf build
 mkdir build
@@ -53,7 +13,7 @@ service postgresql stop
 cd $IROOT/
 sed -i 's|cmake |CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake |g' $IROOT/ffead-cpp-sql-raw/resources/rundyn-automake.sh
 #sed -i 's|-fprofile-instr-generate=/tmp/cprof.prof|-fprofile-instr-generate=/tmp/cprofdi.prof|g' $IROOT/ffead-cpp-sql-raw/rtdcf/CMakeLists.txt.template
-apt update -yqq && apt install -yqq vim gdb
+apt update -yqq && apt install -yqq vim gdb net-tools telnet iputils-ping
 ./install_ffead-cpp-sql-raw-profiled.sh async
 
 #mv $IROOT/ffead-cpp-sql-raw $IROOT/ffead-cpp-5.0-sql
diff --git a/docker/techempower-config/sql-async-profiled-install-clang.sh b/docker/techempower-config/sql-async-profiled-install-clang.sh
index af75c5e84..1e0d30212 100644
--- a/docker/techempower-config/sql-async-profiled-install-clang.sh
+++ b/docker/techempower-config/sql-async-profiled-install-clang.sh
@@ -1,45 +1,4 @@
-mkdir /tmp/profile-data
-
-rm -rf $IROOT/ffead-cpp-5.0-sql
-
-if [ "$1" = "batch" ]
-then
-	apt remove -yqq libpq-dev
-	apt autoremove -yqq
-	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
-	apt update && apt install -y bison flex libreadline-dev
-	cd /tmp
-	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
-	#tar -xzf batch_mode_ubuntu.tar.gz
-	#cd postgres-batch_mode_ubuntu
-	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
-	#make && make install
-	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
-	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
-	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
-	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
-	git apply ./v22-0001-libpq-batch.patch
-	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
-	cd src/interfaces/libpq
-	make all install -j4
-	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
-fi
-
-apt update -yqq && apt install -yqq clang
-
 cd $IROOT/ffead-cpp-src/
-rm -rf $IROOT/ffead-cpp-sql-raw
-rm -rf CMakeCache.txt CMakeFiles
-rm -rf web/te-benchmark-um web/te-benchmark-um-mgr web/te-benchmark-um-pq
-
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq/libte_benchmark_um_pq${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-
-sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq-async/config/sdorm.xml
 
 rm -rf build
 mkdir build
diff --git a/docker/techempower-config/sql-async-profiled-install.sh b/docker/techempower-config/sql-async-profiled-install.sh
index 0782f77ff..e4d6ea056 100644
--- a/docker/techempower-config/sql-async-profiled-install.sh
+++ b/docker/techempower-config/sql-async-profiled-install.sh
@@ -1,42 +1,4 @@
-mkdir /tmp/profile-data
-
-rm -rf $IROOT/ffead-cpp-5.0-sql
-
-if [ "$1" = "batch" ]
-then
-	apt remove -yqq libpq-dev
-	apt autoremove -yqq
-	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
-	apt update && apt install -y bison flex libreadline-dev
-	cd /tmp
-	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
-	#tar -xzf batch_mode_ubuntu.tar.gz
-	#cd postgres-batch_mode_ubuntu
-	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
-	#make && make install
-	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
-	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
-	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
-	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
-	git apply ./v22-0001-libpq-batch.patch
-	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
-	cd src/interfaces/libpq
-	make all install -j4
-	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
-fi
-
 cd $IROOT/ffead-cpp-src/
-rm -rf CMakeCache.txt CMakeFiles
-rm -rf web/te-benchmark-um web/te-benchmark-um-mgr web/te-benchmark-um-pq
-
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq/libte_benchmark_um_pq${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-
-sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq-async/config/sdorm.xml
 
 rm -rf build
 mkdir build
diff --git a/docker/techempower-config/sql-profiled-install-clang.sh b/docker/techempower-config/sql-profiled-install-clang.sh
index be3711234..f32879da6 100644
--- a/docker/techempower-config/sql-profiled-install-clang.sh
+++ b/docker/techempower-config/sql-profiled-install-clang.sh
@@ -1,44 +1,4 @@
-mkdir /tmp/profile-data
-
-rm -rf $IROOT/ffead-cpp-5.0-sql
-
-if [ "$1" = "batch" ]
-then
-	apt remove -yqq libpq-dev
-	apt autoremove -yqq
-	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
-	apt update && apt install -y bison flex libreadline-dev
-	cd /tmp
-	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
-	#tar -xzf batch_mode_ubuntu.tar.gz
-	#cd postgres-batch_mode_ubuntu
-	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
-	#make && make install
-	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
-	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
-	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
-	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
-	git apply ./v22-0001-libpq-batch.patch
-	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
-	cd src/interfaces/libpq
-	make all install -j4
-	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
-fi
-
-apt update -yqq && apt install -yqq clang
-
 cd $IROOT/ffead-cpp-src/
-rm -rf CMakeCache.txt CMakeFiles
-rm -rf web/te-benchmark-um web/te-benchmark-um-mgr web/te-benchmark-um-pq-async
-
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq-async)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq-async/libte_benchmark_um_pq_async${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-
-sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq/config/sdorm.xml
 
 rm -rf build
 mkdir build
diff --git a/docker/techempower-config/sql-profiled-install.sh b/docker/techempower-config/sql-profiled-install.sh
index 194f53a5c..0d8e7a2a2 100644
--- a/docker/techempower-config/sql-profiled-install.sh
+++ b/docker/techempower-config/sql-profiled-install.sh
@@ -1,42 +1,4 @@
-mkdir /tmp/profile-data
-
-rm -rf $IROOT/ffead-cpp-5.0-sql
-
-if [ "$1" = "batch" ]
-then
-	apt remove -yqq libpq-dev
-	apt autoremove -yqq
-	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
-	apt update && apt install -y bison flex libreadline-dev
-	cd /tmp
-	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
-	#tar -xzf batch_mode_ubuntu.tar.gz
-	#cd postgres-batch_mode_ubuntu
-	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
-	#make && make install
-	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
-	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
-	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
-	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
-	git apply ./v22-0001-libpq-batch.patch
-	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
-	cd src/interfaces/libpq
-	make all install -j4
-	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
-fi
-
 cd $IROOT/ffead-cpp-src/
-rm -rf CMakeCache.txt CMakeFiles
-rm -rf web/te-benchmark-um web/te-benchmark-um-mgr web/te-benchmark-um-pq-async
-
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
-sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq-async)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq-async/libte_benchmark_um_pq_async${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
-
-sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq/config/sdorm.xml
 
 rm -rf build
 mkdir build
diff --git a/docker/techempower-config/sql-profiled-util.sh b/docker/techempower-config/sql-profiled-util.sh
new file mode 100644
index 000000000..5c95ca97a
--- /dev/null
+++ b/docker/techempower-config/sql-profiled-util.sh
@@ -0,0 +1,54 @@
+mkdir /tmp/profile-data
+
+rm -rf $IROOT/ffead-cpp-5.0-sql
+
+if [ "$1" = "batch" ]
+then
+	apt remove -yqq libpq-dev
+	apt autoremove -yqq
+	rm -f /usr/lib/x86_64-linux-gnu/libpq.*
+	apt update && apt install -y bison flex libreadline-dev
+	cd /tmp
+	#wget -q https://github.com/an-tao/postgres/archive/batch_mode_ubuntu.tar.gz
+	#tar -xzf batch_mode_ubuntu.tar.gz
+	#cd postgres-batch_mode_ubuntu
+	#./configure --prefix=/usr CFLAGS='-O2 -pipe -march=native'
+	#make && make install
+	wget -nv https://github.com/postgres/postgres/archive/b787d4ce6d910080065025bcd5f968544997271f.zip
+	unzip -q b787d4ce6d910080065025bcd5f968544997271f.zip
+	cd postgres-b787d4ce6d910080065025bcd5f968544997271f
+	wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
+	git apply ./v22-0001-libpq-batch.patch
+	./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
+	cd src/interfaces/libpq
+	make all install -j4
+	cp ../../../src/include/postgres_ext.h ../../../src/include/pg_config_ext.h libpq-fe.h /usr/include
+fi
+
+if [ "$2" = "clang" ]
+then
+	apt update -yqq && apt install -yqq clang
+fi
+
+cd $IROOT/ffead-cpp-src/
+rm -rf $IROOT/ffead-cpp-sql-raw
+rm -rf CMakeCache.txt CMakeFiles
+rm -rf web/te-benchmark-um web/te-benchmark-um-mgr
+
+sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um)||g' CMakeLists.txt
+sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-mgr)||g' CMakeLists.txt
+sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um/libte_benchmark_um${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
+sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-mgr/libte_benchmark_um_mgr${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
+
+if [ "$3" = "async" ]
+then
+	sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq)||g' CMakeLists.txt
+	sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq/libte_benchmark_um_pq${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
+	sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq-async/config/sdorm.xml
+	rm -rf web/te-benchmark-um-pq
+else
+	sed -i 's|add_subdirectory(${PROJECT_SOURCE_DIR}/web/te-benchmark-um-pq-async)||g' CMakeLists.txt
+	sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/web/te-benchmark-um-pq-async/libte_benchmark_um_pq_async${LIB_EXT} DESTINATION ${PROJECT_NAME}-bin/lib)||g' CMakeLists.txt
+	sed -i 's|tfb-database|localhost|g' $IROOT/ffead-cpp-src/web/te-benchmark-um-pq/config/sdorm.xml
+	rm -rf web/te-benchmark-um-pq-async
+fi
diff --git a/src/framework/ConfigurationHandler.cpp b/src/framework/ConfigurationHandler.cpp
index 663c44de2..cfa499284 100644
--- a/src/framework/ConfigurationHandler.cpp
+++ b/src/framework/ConfigurationHandler.cpp
@@ -2165,7 +2165,7 @@ void ConfigurationHandler::handleDataSourceEntities(const std::string& appName,
 					}
 					else
 					{
-						std::map<std::string, Mapping>::iterator it;
+						std::map<std::string, Mapping, std::less<>>::iterator it;
 						for(it=mappings.begin();it!=mappings.end();++it)
 						{
 							if(it->second.appName==appName)
@@ -2581,7 +2581,7 @@ void ConfigurationHandler::initializeDataSources()
 	std::map<std::string, std::map<std::string, Mapping, std::less<> >, std::less<> > sdormEntityMappings = ConfigurationData::getInstance()->sdormEntityMappings;
 	std::map<std::string, bool, std::less<> >::iterator mit;
 	for (mit=mycntxts.begin();mit!=mycntxts.end();++mit) {
-		std::map<std::string, ConnectionProperties>::iterator it;
+		std::map<std::string, ConnectionProperties, std::less<> >::iterator it;
 		if(sdormConnProperties.find(mit->first)!=sdormConnProperties.end())
 		{
 			logger << "app for ds is " << mit->first << std::endl;
@@ -2621,7 +2621,7 @@ void ConfigurationHandler::initializeCaches()
 		if(cacheConnProperties.find(mit->first)!=cacheConnProperties.end())
 		{
 			std::map<std::string, ConnectionProperties, std::less<> > allProps = cacheConnProperties[mit->first];
-			std::map<std::string, ConnectionProperties>::iterator it;
+			std::map<std::string, ConnectionProperties, std::less<>>::iterator it;
 			for (it=allProps.begin();it!=allProps.end();++it) {
 				CacheManager::initCache(allProps[it->first], mit->first, &ConfigurationHandler::populateClassBeanInstanceCb);
 			}
diff --git a/src/framework/DCPGenerator.cpp b/src/framework/DCPGenerator.cpp
index b8155e0aa..0024715a8 100644
--- a/src/framework/DCPGenerator.cpp
+++ b/src/framework/DCPGenerator.cpp
@@ -35,7 +35,7 @@ std::string DCPGenerator::generateDCPAll()
 {
 	std::map<std::string,std::string, std::less<> > fileNames = ConfigurationData::getInstance()->dynamicCppPagesMap;
 	std::string bodies,headersb="#include \"AfcUtil.h\"",funcdefs;
-	std::map<std::string, std::string>::iterator it;
+	std::map<std::string, std::string, std::less<>>::iterator it;
 	for (it=fileNames.begin();it!=fileNames.end();++it)
 	{
 		bodies += generateDCP(it->first,headersb,funcdefs,it->second);
diff --git a/src/framework/ServiceTask.cpp b/src/framework/ServiceTask.cpp
index 7626f9a17..05ff038f8 100644
--- a/src/framework/ServiceTask.cpp
+++ b/src/framework/ServiceTask.cpp
@@ -123,7 +123,7 @@ void ServiceTask::storeSessionAttributes(HttpResponse* res, HttpRequest* req, co
 		//int seconds = sessionTimeout;
 		date.updateSeconds(sessionTimeout);
 		DateFormat dformat("%a, %d %b %Y %H:%M:%S");
-		std::map<std::string,std::string>::iterator it;
+		std::map<std::string,std::string, std::less<>>::iterator it;
 
 		/*if(sessatserv)
 		{
@@ -438,7 +438,7 @@ WebSockHandler* ServiceTask::handleWebsockOpen(WebSocketData* req, WebSocketResp
 	req->cnxtName = hreq->getCntxt_name();
 
 	std::map<std::string, std::string, std::less<> > websockcntMap = ConfigurationData::getInstance()->websocketMappingMap.find(req->getCntxt_name())->second;
-	std::map<std::string, std::string>::iterator it;
+	std::map<std::string, std::string, std::less<>>::iterator it;
 	for (it=websockcntMap.begin();it!=websockcntMap.end();++it) {
 		if(ConfigurationData::urlMatchesPath(req->getCntxt_name(), it->first, hreq->getCurl()))
 		{
diff --git a/src/framework/TemplateGenerator.cpp b/src/framework/TemplateGenerator.cpp
index babe1a0c3..e5b2a56db 100644
--- a/src/framework/TemplateGenerator.cpp
+++ b/src/framework/TemplateGenerator.cpp
@@ -227,7 +227,7 @@ std::string TemplateGenerator::generateTempCdAll(const std::string& serverRootDi
 {
 	std::map<std::string, std::string, std::less<> > templateMappingMap = ConfigurationData::getInstance()->templateFilesMap;
 	std::string bodies,headersb="#include \"AfcInclude.h\"",funcdefs;
-	std::map<std::string, std::string>::iterator msssit;
+	std::map<std::string, std::string, std::less<>>::iterator msssit;
 	for (msssit=templateMappingMap.begin();msssit!=templateMappingMap.end();++msssit)
 	{
 		bodies += generateTempCd(msssit->first,headersb,funcdefs,msssit->second);
diff --git a/src/modules/cache/CacheInterface.h b/src/modules/cache/CacheInterface.h
index 3a78e3240..9d4fff3a7 100644
--- a/src/modules/cache/CacheInterface.h
+++ b/src/modules/cache/CacheInterface.h
@@ -148,7 +148,7 @@ class CacheInterface {
 			rv.push_back(GenericObject::getObjectFromSerilaizedState<T>(vals.at(i)));
 		}
 	}
-	virtual void* executeCommand(const std::string& command, ...)=0;
+	virtual void* executeCommand(const std::string command, ...)=0;
 };
 
 #endif /* CACHEINTERFACE_H_ */
diff --git a/src/modules/cache/CacheManager.cpp b/src/modules/cache/CacheManager.cpp
index edd349acc..9e1cf5ff1 100644
--- a/src/modules/cache/CacheManager.cpp
+++ b/src/modules/cache/CacheManager.cpp
@@ -25,12 +25,37 @@
 std::map<std::string, CacheManager*> CacheManager::caches;
 std::map<std::string, std::string> CacheManager::defDsnNames;
 std::map<std::string, CacheInterface*> CacheManager::sevhCchImpls;
+std::map<std::string, bool> CacheManager::appInitCompletionStatus;
 bool CacheManager::isSinglEVH = false;
 
 void CacheManager::init(bool issevh) {
 	isSinglEVH = issevh;
 }
 
+void CacheManager::triggerAppInitCompletion(std::string appNameN) {
+	std::string appName = appNameN;
+	if(appName=="") {
+		appName = CommonUtils::getAppName();
+	} else {
+		StringUtil::replaceAll(appName, "-", "_");
+		RegexUtil::replace(appName, "[^a-zA-Z0-9_]+", "");
+	}
+	if(appInitCompletionStatus.find(appName)!=appInitCompletionStatus.end()) {
+		appInitCompletionStatus[appName] = true;
+	}
+}
+
+bool CacheManager::isInitCompleted() {
+	bool flag = true;
+	if(appInitCompletionStatus.size()>0) {
+		std::map<std::string, bool>::iterator it = appInitCompletionStatus.begin();
+		for(;it!=appInitCompletionStatus.end();++it) {
+			flag &= it->second;
+		}
+	}
+	return flag;
+}
+
 void CacheManager::initCache(const ConnectionProperties& props, const std::string& appNameN, GetClassBeanIns f) {
 	Logger logger = LoggerFactory::getLogger("CacheManager");
 	std::string name = StringUtil::trimCopy(props.getName());
@@ -77,6 +102,7 @@ void CacheManager::initCache(const ConnectionProperties& props, const std::strin
 					const Method& meth = cbi.clas->getMethod(v.at(1), argus);
 					if(meth.getMethodName()!="")
 					{
+						appInitCompletionStatus[appName] = false;
 						ref->invokeMethodGVP(_temp, meth, valus);
 					}
 				}
diff --git a/src/modules/cache/CacheManager.h b/src/modules/cache/CacheManager.h
index 2ee3aedd7..e860b44ab 100644
--- a/src/modules/cache/CacheManager.h
+++ b/src/modules/cache/CacheManager.h
@@ -37,6 +37,7 @@ class CacheManager {
 	Logger logger;
 	static std::map<std::string, CacheManager*> caches;
 	static std::map<std::string, std::string> defDsnNames;
+	static std::map<std::string, bool> appInitCompletionStatus;
 	ConnectionProperties props;
 	ConnectionPooler* pool;
 	Reflector* reflector;
@@ -50,6 +51,8 @@ class CacheManager {
 	virtual ~CacheManager();
 	static CacheInterface* getImpl(std::string name = "", std::string appName = "");
 	static void cleanImpl(CacheInterface*);
+	static void triggerAppInitCompletion(std::string appName = "");
+	static bool isInitCompleted();
 };
 
 #endif /* CACHEMANAGER_H_ */
diff --git a/src/modules/cache/memcached/MemcachedImpl.cpp b/src/modules/cache/memcached/MemcachedImpl.cpp
index 95e84a2b9..6d431bba7 100644
--- a/src/modules/cache/memcached/MemcachedImpl.cpp
+++ b/src/modules/cache/memcached/MemcachedImpl.cpp
@@ -208,7 +208,7 @@ bool MemcachedImpl::replyStatus(const memcached_return_t& reply) {
 	return memcached_success(reply);
 }
 
-void* MemcachedImpl::executeCommand(const std::string& command, ...) {
+void* MemcachedImpl::executeCommand(const std::string command, ...) {
 	throw std::runtime_error("Not Implemented");
 }
 
diff --git a/src/modules/cache/memcached/MemcachedImpl.h b/src/modules/cache/memcached/MemcachedImpl.h
index 05ed9f2a0..aa9b68001 100644
--- a/src/modules/cache/memcached/MemcachedImpl.h
+++ b/src/modules/cache/memcached/MemcachedImpl.h
@@ -67,7 +67,7 @@ class MemcachedImpl : public CacheInterface {
 	std::map<std::string, std::string> statistics();
 	bool flushAll();
 
-	void* executeCommand(const std::string& command, ...);
+	void* executeCommand(const std::string command, ...);
 	bool addToQ(const std::string& qname, const std::string& value);
 	std::string getFromQ(const std::string& qname);
 };
diff --git a/src/modules/cache/memory/MemoryCacheImpl.cpp b/src/modules/cache/memory/MemoryCacheImpl.cpp
index df8d2d05f..0d0041452 100644
--- a/src/modules/cache/memory/MemoryCacheImpl.cpp
+++ b/src/modules/cache/memory/MemoryCacheImpl.cpp
@@ -220,7 +220,7 @@ void MemoryCacheImpl::mgetRaw(const std::vector<std::string>& keys, std::vector<
 	p->lock.unlock();
 }
 
-void* MemoryCacheImpl::executeCommand(const std::string& command, ...) {
+void* MemoryCacheImpl::executeCommand(const std::string command, ...) {
 	throw std::runtime_error("Not Implemented");
 }
 
diff --git a/src/modules/cache/memory/MemoryCacheImpl.h b/src/modules/cache/memory/MemoryCacheImpl.h
index ff7b1079c..b0a3b7415 100644
--- a/src/modules/cache/memory/MemoryCacheImpl.h
+++ b/src/modules/cache/memory/MemoryCacheImpl.h
@@ -77,7 +77,7 @@ class MemoryCacheImpl : public CacheInterface {
 	std::map<std::string, std::string> statistics();
 	bool flushAll();
 
-	void* executeCommand(const std::string& command, ...);
+	void* executeCommand(const std::string command, ...);
 	bool addToQ(const std::string& qname, const std::string& value);
 	std::string getFromQ(const std::string& qname);
 };
diff --git a/src/modules/cache/redis/RedisCacheImpl.cpp b/src/modules/cache/redis/RedisCacheImpl.cpp
index 615245215..f63455b5e 100644
--- a/src/modules/cache/redis/RedisCacheImpl.cpp
+++ b/src/modules/cache/redis/RedisCacheImpl.cpp
@@ -197,10 +197,9 @@ redisReply* RedisCacheImpl::execute(const char* format, ...) {
 	return reply;
 }
 
-void* RedisCacheImpl::executeCommand(const std::string& command, ...) {
+void* RedisCacheImpl::executeCommand(const std::string command, ...) {
 	va_list vl;
-	std::string c = command;
-	va_start(vl, c);
+	va_start(vl, command);
 	void* reply = execute(command.c_str());
 	va_end(vl);
 	return reply;
diff --git a/src/modules/cache/redis/RedisCacheImpl.h b/src/modules/cache/redis/RedisCacheImpl.h
index 370cd334d..4f1386281 100644
--- a/src/modules/cache/redis/RedisCacheImpl.h
+++ b/src/modules/cache/redis/RedisCacheImpl.h
@@ -66,7 +66,7 @@ class RedisCacheImpl: public CacheInterface {
 	std::map<std::string, std::string> statistics();
 	bool flushAll();
 
-	void* executeCommand(const std::string& command, ...);
+	void* executeCommand(const std::string command, ...);
 	bool addToQ(const std::string& qname, const std::string& value);
 	std::string getFromQ(const std::string& qname);
 };
diff --git a/src/modules/common/AppDefines.xmake.h.in b/src/modules/common/AppDefines.xmake.h.in
new file mode 100644
index 000000000..a89e715b1
--- /dev/null
+++ b/src/modules/common/AppDefines.xmake.h.in
@@ -0,0 +1,90 @@
+/*
+	Copyright 2009-2020, Sumeet Chhetri
+
+    Licensed under the Apache License, Version 2.0 (const the& "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+${define INC_MEMORYCACHE}
+${define INC_REDISCACHE}
+${define INC_MEMCACHED}
+${define INC_SDORM}
+${define INC_SDORM_SQL}
+${define INC_SDORM_MONGO}
+${define INC_BINSER}
+${define INC_JOBS}
+${define APPLE}
+${define MINGW}
+${define CYGWIN}
+${define EMSCRIPTEN}
+${define DEBUG_MODE}
+
+${define USE_EPOLL}
+${define USE_KQUEUE}
+${define USE_EVPORT}
+${define USE_DEVPOLL}
+${define USE_POLL}
+${define USE_SELECT}
+${define USE_WIN_IOCP}
+${define USE_IO_URING}
+
+${define HAVE_LIBPQ}
+${define HAVE_REGEX}
+${define HAVE_SSLINC}
+${define HAVE_SSLLIB}
+${define HAVE_REDISINC}
+${define HAVE_REDISLIB}
+${define HAVE_MEMCACHEDINC}
+${define HAVE_MEMCACHEDLIB}
+${define HAVE_CURLLIB}
+${define HAVE_EXECINFOINC}
+${define HAVE_UUIDINC}
+${define HAVE_OSSPUUIDINC}
+${define HAVE_BSDUUIDINC}
+${define HAVE_SQLINC}
+${define HAVE_ODBCLIB}
+${define HAVE_MONGOINC}
+${define HAVE_MONGOCLIB}
+${define HAVE_BSONINC}
+${define HAVE_BSONLIB}
+${define INC_JOBS}
+${define OS_BSD}
+${define OS_SOLARIS}
+${define OS_LINUX}
+${define OS_MINGW}
+${define OS_DARWIN}
+${define OS_ANDROID}
+${define SRV_EMB}
+${define SRV_CINATRA}
+${define SRV_LITHIUM}
+${define SRV_DROGON}
+${define HAVE_ACCEPT4}
+${define HAVE_TCP_QUICKACK}
+${define HAVE_TCP_DEFER_ACCEPT}
+${define HAVE_TCP_FASTOPEN}
+${define HAVE_LIBPQ_BATCH}
+
+#ifdef HAVE_ODBCLIB
+#define HAVE_LIBODBC 1
+#endif
+
+#define INC_WEBSVC 1
+#define INC_TPE 1
+#define INC_DVIEW 1
+#define INC_DCP 1
+#define INC_XMLSER 1
+#define IS_SENDFILE 1
+#define BUILD_CMAKE 1
+
+#ifdef APPLE
+#define OS_DARWIN 1
+#endif
diff --git a/src/modules/common/Compatibility.cpp b/src/modules/common/Compatibility.cpp
index 06d90a4fb..4af51d5fd 100644
--- a/src/modules/common/Compatibility.cpp
+++ b/src/modules/common/Compatibility.cpp
@@ -426,3 +426,9 @@ int pthread_setaffinity_np(pthread_t thread, size_t cpu_size,
   return 0;
 }
 #endif
+
+#ifdef EMSCRIPTEN
+FILE * popen (const char *command, const char *mode) {
+	return NULL;
+}
+#endif
diff --git a/src/modules/common/Compatibility.h b/src/modules/common/Compatibility.h
index 6d60818bf..34832984c 100644
--- a/src/modules/common/Compatibility.h
+++ b/src/modules/common/Compatibility.h
@@ -238,6 +238,10 @@ typedef int NUMEVENTS;
 #define SOCKET_ERROR   -1  // basic WinSock error
 #define closesocket(s) close(s);  // Unix uses file descriptors, WinSock doesn't...
 
+#ifdef EMSCRIPTEN
+FILE * popen (const char *command, const char *mode);
+#endif
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
diff --git a/src/modules/common/Logger.cpp b/src/modules/common/Logger.cpp
index 8a70a561a..a374b2010 100644
--- a/src/modules/common/Logger.cpp
+++ b/src/modules/common/Logger.cpp
@@ -86,7 +86,7 @@ Logger::~Logger()
 	this->config = NULL;
 }
 
-void Logger::write(const std::string& msg, const std::string& mod, const bool& newline)
+void Logger::writeInternl(const std::string& msg, const std::string& mod, const bool& newline)
 {
 	if(config==NULL)return;
 	Date dat;
@@ -99,7 +99,7 @@ void Logger::write(const std::string& msg, const std::string& mod, const bool& n
 	config->lock->unlock();
 }
 
-void Logger::write(std::ostream& (*pf) (std::ostream&), const std::string& mod)
+void Logger::writeToStream(std::ostream& (*pf) (std::ostream&), const std::string& mod)
 {
 	if(config==NULL)return;
 	Date dat;
@@ -117,7 +117,7 @@ void Logger::fatal(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]>=4)
 	{
-		write(msg,LEVEL_FATAL,true);
+		writeInternl(msg,LEVEL_FATAL,true);
 	}
 }
 
@@ -126,7 +126,7 @@ void Logger::error(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]>=4)
 	{
-		write(msg,LEVEL_ERROR,true);
+		writeInternl(msg,LEVEL_ERROR,true);
 	}
 }
 
@@ -135,7 +135,7 @@ void Logger::warn(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]>=4)
 	{
-		write(msg,LEVEL_WARN,true);
+		writeInternl(msg,LEVEL_WARN,true);
 	}
 }
 
@@ -144,7 +144,7 @@ void Logger::info(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]>=4)
 	{
-		write(msg,LEVEL_INFO,true);
+		writeInternl(msg,LEVEL_INFO,true);
 	}
 }
 
@@ -153,7 +153,7 @@ void Logger::debug(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]==2 || levelMap[config->mode]==3)
 	{
-		write(msg,LEVEL_DEBUG,true);
+		writeInternl(msg,LEVEL_DEBUG,true);
 	}
 }
 
@@ -162,14 +162,14 @@ void Logger::trace(const std::string& msg)
 	if(config==NULL)return;
 	if(levelMap[config->mode]==2)
 	{
-		write(msg,LEVEL_TRACE,true);
+		writeInternl(msg,LEVEL_TRACE,true);
 	}
 }
 
 Logger& operator<< (Logger& logger, std::ostream& (*pf) (std::ostream&))
 {
 	if(logger.config==NULL) return logger;
-	logger.write(pf, logger.level);
+	logger.writeToStream(pf, logger.level);
 	if(pf == static_cast <std::ostream & (*)(std::ostream &)> (std::endl) || pf == static_cast <std::ostream & (*)(std::ostream &)> (std::flush)) {
 		logger.level = Logger::LEVEL_INFO;
 	}
diff --git a/src/modules/common/Logger.h b/src/modules/common/Logger.h
index 13d77e41c..ff80d3daa 100644
--- a/src/modules/common/Logger.h
+++ b/src/modules/common/Logger.h
@@ -69,7 +69,7 @@ class Logger {
 	friend Logger& operator<< (Logger& logger, const T& msg)
 	{
 		if(logger.config==NULL) return logger;
-		logger.write(msg, logger.level, false);
+		logger.writeTemplate(msg, logger.level, false);
 		return logger;
 	}
 	friend Logger& operator<< (Logger& logger, std::ostream& (*pf) (std::ostream&));
@@ -80,12 +80,12 @@ class Logger {
 		if(config==NULL) return;
 		int size_s = snprintf( nullptr, 0, format.c_str(), args ... ) + 1; // Extra space for '\0'
 		if( size_s <= 0 ) {
-			write(format, level, false);
+			writeInternl(format, level, false);
 			return;
 		}
 		char buf[size_s];
 		snprintf( buf, size_s, format.c_str(), args ... );
-		write(std::string( &buf[0], size_s - 1 ), level, false);
+		writeInternl(std::string( &buf[0], size_s - 1 ), level, false);
 	}
 private:
 	static std::map<std::string, int> levelMap;
@@ -96,9 +96,9 @@ class Logger {
 	Logger(LoggerConfig *config, const std::string& className, const std::string& level);
 	std::string className, level, oldLevel;
 	LoggerConfig *config;
-	void write(const std::string& msg, const std::string& mod, const bool& newline);
+	void writeInternl(const std::string& msg, const std::string& mod, const bool& newline);
 	template <typename T>
-	void write(const T& tmsg, const std::string& mod, const bool& newline)
+	void writeTemplate(const T& tmsg, const std::string& mod, const bool& newline)
 	{
 		if(config==NULL)return;
 		Date dat;
@@ -117,6 +117,6 @@ class Logger {
 		}
 		config->lock->unlock();
 	}
-	void write(std::ostream& (*pf) (std::ostream&), const std::string& mod);
+	void writeToStream(std::ostream& (*pf) (std::ostream&), const std::string& mod);
 };
 #endif /* LOGGER_H_ */
diff --git a/src/modules/http/HttpResponse.cpp b/src/modules/http/HttpResponse.cpp
index 98ad58eb1..729527a08 100644
--- a/src/modules/http/HttpResponse.cpp
+++ b/src/modules/http/HttpResponse.cpp
@@ -1007,7 +1007,7 @@ std::string HttpResponse::toPluginString() {
 	text += (CastUtil::fromNumber(this->epilogue.length()) + "\n");
 	text += (this->epilogue);
 
-	std::map<std::string,std::string,cicomp>::iterator it;
+	RMap::iterator it;
 	text += (CastUtil::fromNumber(this->headers.size()) + "\n");
 	for(it=this->headers.begin();it!=this->headers.end();++it)
 	{
diff --git a/src/modules/http/HttpSession.cpp b/src/modules/http/HttpSession.cpp
index 08f141dd1..76e9c82bf 100644
--- a/src/modules/http/HttpSession.cpp
+++ b/src/modules/http/HttpSession.cpp
@@ -47,7 +47,7 @@ Map HttpSession::getSessionAttributes()
 
 void HttpSession::setSessionAttributes(const Map& sessionAttributes)
 {
-	std::map<std::string,std::string>::const_iterator it;
+	Map::const_iterator it;
 	for(it=sessionAttributes.begin();it!=sessionAttributes.end();it++)
 	{
 		this->sessionAttributes[it->first] = it->second;
diff --git a/src/modules/ioc/FFEADContext.cpp b/src/modules/ioc/FFEADContext.cpp
index 47affb32e..e4666e07c 100644
--- a/src/modules/ioc/FFEADContext.cpp
+++ b/src/modules/ioc/FFEADContext.cpp
@@ -392,7 +392,7 @@ void FFEADContext::clearAllSingletonBeans(const std::map<std::string, bool, std:
 {
 	if(cleared)
 		return;
-	std::map<std::string, bool>::const_iterator it;
+	std::map<std::string, bool, std::less<> >::const_iterator it;
 	for (it=servingContexts.begin();it!=servingContexts.end();it++)
 	{
 		clear(it->first);
@@ -403,7 +403,7 @@ void FFEADContext::clearAllSingletonBeans(const std::map<std::string, bool, std:
 void FFEADContext::initializeAllSingletonBeans(const std::map<std::string, bool, std::less<> >& servingContexts, Reflector* reflector)
 {
 	this->reflector = reflector;
-	std::map<std::string,Bean>::iterator beanIter;
+	beanMap::iterator beanIter;
 	logger << "Initializing singleton beans..." << std::endl;
 	for (beanIter=beans.begin();beanIter!=beans.end();beanIter++)
 	{
diff --git a/src/modules/sdorm/DataSourceManager.cpp b/src/modules/sdorm/DataSourceManager.cpp
index b46b3936e..0f14d7382 100644
--- a/src/modules/sdorm/DataSourceManager.cpp
+++ b/src/modules/sdorm/DataSourceManager.cpp
@@ -26,12 +26,37 @@ std::map<std::string, DataSourceManager*> DataSourceManager::dsns;
 std::map<std::string, std::string> DataSourceManager::defDsnNames;
 std::map<std::string, DataSourceInterface*> DataSourceManager::sevhDsnImpls;
 std::map<std::string, void*> DataSourceManager::sevhDsnRawImpls;
+std::map<std::string, bool> DataSourceManager::appInitCompletionStatus;
 bool DataSourceManager::isSingleEVH = false;
 
 void DataSourceManager::init(bool issevh) {
 	isSingleEVH = issevh;
 }
 
+void DataSourceManager::triggerAppInitCompletion(std::string appNameN) {
+	std::string appName = appNameN;
+	if(appName=="") {
+		appName = CommonUtils::getAppName();
+	} else {
+		StringUtil::replaceAll(appName, "-", "_");
+		RegexUtil::replace(appName, "[^a-zA-Z0-9_]+", "");
+	}
+	if(appInitCompletionStatus.find(appName)!=appInitCompletionStatus.end()) {
+		appInitCompletionStatus[appName] = true;
+	}
+}
+
+bool DataSourceManager::isInitCompleted() {
+	bool flag = true;
+	if(appInitCompletionStatus.size()>0) {
+		std::map<std::string, bool>::iterator it = appInitCompletionStatus.begin();
+		for(;it!=appInitCompletionStatus.end();++it) {
+			flag &= it->second;
+		}
+	}
+	return flag;
+}
+
 void DataSourceManager::initDSN(const ConnectionProperties& props, const Mapping& mapping, GetClassBeanIns f)
 {
 	Logger logger = LoggerFactory::getLogger("DataSourceManager");
@@ -77,6 +102,7 @@ void DataSourceManager::initDSN(const ConnectionProperties& props, const Mapping
 					const Method& meth = cbi.clas->getMethod(v.at(1), argus);
 					if(meth.getMethodName()!="")
 					{
+						appInitCompletionStatus[appName] = false;
 						ref->invokeMethodGVP(_temp, meth, valus);
 					}
 				}
diff --git a/src/modules/sdorm/DataSourceManager.h b/src/modules/sdorm/DataSourceManager.h
index 6e432ca84..0d4c8fdb9 100644
--- a/src/modules/sdorm/DataSourceManager.h
+++ b/src/modules/sdorm/DataSourceManager.h
@@ -44,6 +44,7 @@ class DataSourceManager {
 	Logger logger;
 	static std::map<std::string, DataSourceManager*> dsns;
 	static std::map<std::string, std::string> defDsnNames;
+	static std::map<std::string, bool> appInitCompletionStatus;
 	ConnectionProperties props;
 	Mapping mapping;
 	ConnectionPooler* pool;
@@ -58,6 +59,8 @@ class DataSourceManager {
 	static void cleanImpl(DataSourceInterface*);
 	static void* getRawImpl(std::string name = "", std::string appName = "");
 	static void cleanRawImpl(DataSourceType*);
+	static void triggerAppInitCompletion(std::string appName = "");
+	static bool isInitCompleted();
 };
 
 #endif /* DATASOURCEMANAGER_H_ */
diff --git a/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp b/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp
index 15845c39b..2a910323f 100644
--- a/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp
+++ b/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp
@@ -53,7 +53,6 @@ bool LibpqDataSourceImpl::init() {
 	}
 	fd = PQsocket(conn);
 	if(isAsync) {
-		PQsetnonblocking(conn, 1);
 		if(RequestReaderHandler::getInstance()!=NULL) {
 #ifdef USE_IO_URING
 			Thread* pthread = new Thread(&handle, this);
@@ -72,10 +71,12 @@ bool LibpqDataSourceImpl::init() {
 #else
 			rdTsk = new PgReadTask(this);
 #endif
+			PQsetnonblocking(conn, 1);
 			RequestReaderHandler::getInstance()->addSf(this);
-			RequestReaderHandler::getInstance()->selector.registerRead(this);
+			RequestReaderHandler::getInstance()->selector.registerRead(this, false, false, true);
 #endif
 		} else {
+			PQsetnonblocking(conn, 1);
 			Thread* pthread = new Thread(&handle, this);
 			pthread->execute();
 		}
@@ -1282,6 +1283,7 @@ PgBatchReadTask::PgBatchReadTask(SocketInterface* sif) {
 	q = NULL;
 	ritem = NULL;
 	queueEntries = false;
+	sendBatch = true;
 }
 
 __AsyncReq* PgBatchReadTask::getNext() {
@@ -1308,9 +1310,11 @@ void PgBatchReadTask::run() {
 			fprintf(stderr, "Failed to consume pg input: %s\n", PQerrorMessage(ths->conn));
 			throw std::runtime_error("Invalid connection state");
 		}
-		if(PQisBusy(ths->conn)==1) return;
+		if(PQisBusy(ths->conn)==1) {
+			return;
+		}
 	}
-	//ths->logger << ("run:Resultset ready...\n");
+	//ths->logger.write("run:Resultset ready...Q size %d\n", ths->Q.size());
 
 	int readQueries = 0;
 	while(!PQisBusy(ths->conn)) {
@@ -1327,6 +1331,7 @@ void PgBatchReadTask::run() {
 		//ths->logger << ("run:Reading Resultset...\n");
 		if(PQresultStatus(res) == PGRES_BATCH_END) {
 			//ths->logger.write("run:End batch...%d\n", readQueries);
+			sendBatch = true;
 			PQclear(res);
 			break;
 		}
@@ -1339,7 +1344,7 @@ void PgBatchReadTask::run() {
 
 		if(ritem==NULL) {
 			PQclear(res);
-			//ths->logger << ("run:Resultset without query oops...\n");
+			//ths->logger.write("run:Resultset without query oops...Q size %q\n", ths->Q.size());
 			continue;
 		}
 
@@ -1499,61 +1504,76 @@ void PgBatchReadTask::run() {
 		//ths->logger << ("run:Done Resultset...\n");
 	}
 
+	processPending();
+#endif
+}
+
+void PgBatchReadTask::processPending() {
+#ifdef HAVE_LIBPQ
+	LibpqDataSourceImpl* ths = (LibpqDataSourceImpl*)sif;
 	int numQueriesInBatch = 0;
 	__AsyncReq* nitem = NULL;
-	while((nitem = getNext())!=NULL) {
-		batchQueries(ths, nitem, numQueriesInBatch);
-		ths->Q.push(nitem);
-		if(numQueriesInBatch>=40) break;
-	}
 
-	if(numQueriesInBatch>0) {
-		if (PQbatchSendQueue(ths->conn) == 0) {
-			fprintf(stderr, "run:PQbatchSendQueue error: %s\n", PQerrorMessage(ths->conn));
-			//PQfinish(ths->conn);
-			//return;
-		} else {
-			//ths->logger.write("run:PQbatchSendQueue from run %d\n", numQueriesInBatch);
+	if(sendBatch && lQ.size()>0) {
+		while((nitem = getNext())!=NULL) {
+			ths->Q.push(nitem);
+			batchQueries(nitem, numQueriesInBatch);
+			if(numQueriesInBatch>=20) break;
 		}
-		queueEntries = true;
-	} else {
+
+		if(numQueriesInBatch>0) {
+			if (PQbatchSendQueue(ths->conn) == 0) {
+				fprintf(stderr, "processPending:PQbatchSendQueue error: %s\n", PQerrorMessage(ths->conn));
+				//PQfinish(ths->conn);
+				//return;
+			} else {
+				//ths->logger.write("processPending:PQbatchSendQueue from run %d, Batch Query Q size %d\n", numQueriesInBatch, ths->Q.size());
+			}
+			sendBatch = false;
+		}
+	}
+	if(lQ.size()==0) {
 		queueEntries = false;
+	} else {
+		queueEntries = true;
 	}
 #endif
 }
 
-void PgBatchReadTask::submit(__AsyncReq* ritem) {
+void PgBatchReadTask::submit(__AsyncReq* nitem) {
 #ifdef HAVE_LIBPQ
 	LibpqDataSourceImpl* ths = (LibpqDataSourceImpl*)sif;
-	if(ritem!=NULL) {
-		if(!queueEntries) {
-			ths->Q.push(ritem);
+	if(nitem!=NULL) {
+		if(!queueEntries && sendBatch) {
+			ths->Q.push(nitem);
 			int numQueriesInBatch = 0;
-			batchQueries(ths, ritem, numQueriesInBatch);
+			batchQueries(nitem, numQueriesInBatch);
 			if (PQbatchSendQueue(ths->conn) == 0) {
 				fprintf(stderr, "submit:PQbatchSendQueue error: %s\n", PQerrorMessage(ths->conn));
 				//PQfinish(ths->conn);
 			} else {
-				//ths->logger.write("submit:PQbatchSendQueue from submit %d\n", numQueriesInBatch);
+				//ths->logger.write("submit:PQbatchSendQueue from submit %d, Batch Query Q size %d\n", numQueriesInBatch, ths->Q.size());
 			}
 			queueEntries = true;
+			sendBatch = false;
 		} else {
-			lQ.push(ritem);
-			//printf("submit:Add Query to Pending Queue\n");
+			lQ.push(nitem);
+			//ths->logger.write("submit:Add Query to Pending Queue...%d\n", lQ.size());
 		}
 	}
 #endif
 }
 
-void PgBatchReadTask::batchQueries(LibpqDataSourceImpl* ths, __AsyncReq* ritem, int& numQueriesInBatch) {
+void PgBatchReadTask::batchQueries(__AsyncReq* nitem, int& numQueriesInBatch) {
 #ifdef HAVE_LIBPQ
-	for (int i = 0; i < ritem->q.size(); ++i) {
-		__AsynQuery* q = ritem->q.at(i);
+	LibpqDataSourceImpl* ths = (LibpqDataSourceImpl*)sif;
+	for (int i = 0; i < nitem->q.size(); ++i) {
+		__AsynQuery* q = nitem->q.at(i);
 		int psize = (int)q->pvals.size();
 
 		if(q->isPrepared && ths->prepStmtMap.find(q->query)==ths->prepStmtMap.end()) {
 			//ths->logger << ("batchQueries:PQsendPrepare\n");
-			ritem->cnt++;
+			nitem->cnt++;
 			ths->prepStmtMap[q->query] = CastUtil::fromNumber(ths->prepStmtMap.size()+1);
 			int qs = PQsendPrepare(ths->conn,ths->prepStmtMap[q->query].c_str(), q->query.c_str(), psize, NULL);
 			//printf("ADD PQsendPrepare to batch\n");
@@ -1563,18 +1583,18 @@ void PgBatchReadTask::batchQueries(LibpqDataSourceImpl* ths, __AsyncReq* ritem,
 				fprintf(stderr, "Failed to prepare query %s\n", PQerrorMessage(ths->conn));
 				if(q->cmcb!=NULL) {
 					q->cmcb(q->ctx, false, q->query, i+1);
-				} else if(ritem->cmcb!=NULL) {
-					ritem->cmcb(ritem->ctx, false, q->query, i+1);
+				} else if(nitem->cmcb!=NULL) {
+					nitem->cmcb(nitem->ctx, false, q->query, i+1);
 				}
 				delete q;
 				q = NULL;
-				while(ritem->q.size()>0) {
-					__AsynQuery* qr = ritem->q.front();
-					ritem->q.erase(ritem->q.begin());
+				while(nitem->q.size()>0) {
+					__AsynQuery* qr = nitem->q.front();
+					nitem->q.erase(nitem->q.begin());
 					delete qr;
 				}
-				delete ritem;
-				ritem = NULL;
+				delete nitem;
+				nitem = NULL;
 				return;
 			}
 		} else {
@@ -1619,18 +1639,18 @@ void PgBatchReadTask::batchQueries(LibpqDataSourceImpl* ths, __AsyncReq* ritem,
 			fprintf(stderr, "Failed to send query %s\n", PQerrorMessage(ths->conn));
 			if(q->cmcb!=NULL) {
 				q->cmcb(q->ctx, false, q->query, i+1);
-			} else if(ritem->cmcb!=NULL) {
-				ritem->cmcb(ritem->ctx, false, q->query, i+1);
+			} else if(nitem->cmcb!=NULL) {
+				nitem->cmcb(nitem->ctx, false, q->query, i+1);
 			}
 			delete q;
 			q = NULL;
-			while(ritem->q.size()>0) {
-				__AsynQuery* qr = ritem->q.front();
-				ritem->q.erase(ritem->q.begin());
+			while(nitem->q.size()>0) {
+				__AsynQuery* qr = nitem->q.front();
+				nitem->q.erase(nitem->q.begin());
 				delete qr;
 			}
-			delete ritem;
-			ritem = NULL;
+			delete nitem;
+			nitem = NULL;
 			return;
 		}
 	}
diff --git a/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.h b/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.h
index 1923be341..b20e624b6 100644
--- a/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.h
+++ b/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.h
@@ -101,12 +101,14 @@ class PgBatchReadTask : public Task {
 	__AsynQuery* q;
 	SocketInterface* sif;
 	std::atomic<bool> queueEntries;
+	std::atomic<bool> sendBatch;
 	std::queue<__AsyncReq*> lQ;
 	void run();
+	void processPending();
 	void submit(__AsyncReq* item);
 	friend class LibpqDataSourceImpl;
 	__AsyncReq* getNext();
-	void batchQueries(LibpqDataSourceImpl* ths, __AsyncReq* ritem, int& numQueriesInBatch);
+	void batchQueries(__AsyncReq* ritem, int& numQueriesInBatch);
 public:
 	virtual ~PgBatchReadTask();
 	PgBatchReadTask(SocketInterface* sif);
diff --git a/src/modules/server-util/NBServer.cpp b/src/modules/server-util/NBServer.cpp
index 107b37656..2a92f1412 100644
--- a/src/modules/server-util/NBServer.cpp
+++ b/src/modules/server-util/NBServer.cpp
@@ -180,7 +180,7 @@ void* NBServer::servicing(void* arg)
 				else
 				{
 					server->selEpolKqEvPrtHandler.reRegisterServerSock(NULL);
-					server->selEpolKqEvPrtHandler.registerRead(NULL);
+					server->selEpolKqEvPrtHandler.registerRead(NULL, false, false);
 				}
 			}
 			else if (descriptor!=-1)
diff --git a/src/modules/server-util/RequestReaderHandler.cpp b/src/modules/server-util/RequestReaderHandler.cpp
index d668653ca..52e8a50d8 100644
--- a/src/modules/server-util/RequestReaderHandler.cpp
+++ b/src/modules/server-util/RequestReaderHandler.cpp
@@ -48,21 +48,35 @@ RequestReaderHandler* RequestReaderHandler::getInstance() {
 }
 
 void RequestReaderHandler::startNL(unsigned int cid) {
+	if(run) {
+		return;
+	}
 	if(!run) {
 		selector.initialize(-1);
+		run = true;
+		Thread* pthread = new Thread(&handle, this);
+		pthread->execute(cid);
 	}
 }
 
-void RequestReaderHandler::addListenerSocket(const SOCKET& listenerSock) {
+void RequestReaderHandler::addListenerSocket(doRegisterListener drl, const SOCKET& listenerSock) {
 	if(listenerSock != INVALID_SOCKET) {
 		this->listenerSock = listenerSock;
+	} else {
+		return;
 	}
-	selector.addListeningSocket(this->listenerSock);
-	if(!run) {
-		run = true;
-		Thread* pthread = new Thread(&handle, this);
-		pthread->execute(-1);
+	if(drl!=NULL) {
+		int counter = 0;
+		while(!drl()) {
+			Thread::sSleep(1);
+			if(counter++==60) {
+				Logger logger = LoggerFactory::getLogger("RequestReaderHandler");
+				logger << "Cannot wait more than 60 seconds for cache/database to initialize, will forcefully start server now...." << std::endl;
+				break;
+			}
+		}
 	}
+	selector.addListeningSocket(this->listenerSock);
 }
 
 void RequestReaderHandler::start(unsigned int cid) {
diff --git a/src/modules/server-util/RequestReaderHandler.h b/src/modules/server-util/RequestReaderHandler.h
index 79132e694..eb7b3703b 100644
--- a/src/modules/server-util/RequestReaderHandler.h
+++ b/src/modules/server-util/RequestReaderHandler.h
@@ -40,6 +40,7 @@
 #endif
 
 typedef SocketInterface* (*SocketInterfaceFactory) (SOCKET);
+typedef bool (*doRegisterListener) ();
 
 class RequestReaderHandler;
 
@@ -68,7 +69,7 @@ class RequestReaderHandler {
 	static RequestReaderHandler* getInstance();
 	void start(unsigned int cid);
 	void startNL(unsigned int cid);
-	void addListenerSocket(const SOCKET& listenerSock = INVALID_SOCKET);
+	void addListenerSocket(doRegisterListener drl, const SOCKET& listenerSock);
 	void stop(std::string, int, bool);
 	RequestReaderHandler(ServiceHandler* shi, const bool& isMain, bool isSinglEVH, const SOCKET& listenerSock = INVALID_SOCKET);
 	void registerSocketInterfaceFactory(const SocketInterfaceFactory& f);
diff --git a/src/modules/server-util/SelEpolKqEvPrt.cpp b/src/modules/server-util/SelEpolKqEvPrt.cpp
index ef85b5dd4..83a8e903f 100644
--- a/src/modules/server-util/SelEpolKqEvPrt.cpp
+++ b/src/modules/server-util/SelEpolKqEvPrt.cpp
@@ -533,16 +533,17 @@ bool SelEpolKqEvPrt::isListeningDescriptor(const SOCKET& descriptor)
 	return false;
 }
 
-bool SelEpolKqEvPrt::registerRead(SocketInterface* obj, const bool& isListeningSock, bool epoll_et)
+bool SelEpolKqEvPrt::registerRead(SocketInterface* obj, const bool& isListeningSock, bool epoll_et, bool isNonBlocking)
 {
 	#ifdef USE_IO_URING
 		return true;
 	#endif
 	SOCKET descriptor = obj->fd;
-	#ifdef OS_MINGW
+	if(!isNonBlocking) {
+#ifdef OS_MINGW
 		u_long iMode = 1;
 		ioctlsocket(descriptor, FIONBIO, &iMode);
-	#else
+#else
 #ifndef HAVE_ACCEPT4
 		fcntl(descriptor, F_SETFL, fcntl(descriptor, F_GETFD, 0) | O_NONBLOCK);
 #else
@@ -559,7 +560,9 @@ bool SelEpolKqEvPrt::registerRead(SocketInterface* obj, const bool& isListeningS
 		int i = 1;
 		setsockopt(descriptor, IPPROTO_TCP, TCP_NODELAY, (void *)&i, sizeof(i));
 		//setsockopt(descriptor, IPPROTO_TCP, TCP_CORK, (void *)&i, sizeof(i));
-	#endif
+#endif
+	}
+
 
 	#if defined(USE_MINGW_SELECT)
 		FD_SET(descriptor, &master);
diff --git a/src/modules/server-util/SelEpolKqEvPrt.h b/src/modules/server-util/SelEpolKqEvPrt.h
index e92f916b3..6c36de29e 100644
--- a/src/modules/server-util/SelEpolKqEvPrt.h
+++ b/src/modules/server-util/SelEpolKqEvPrt.h
@@ -249,7 +249,7 @@ class SelEpolKqEvPrt : public EventHandler {
 	bool isListeningDescriptor(const SOCKET& descriptor);
 	bool registerWrite(SocketInterface* obj);
 	bool unRegisterWrite(SocketInterface* obj);
-	bool registerRead(SocketInterface* obj, const bool& isListeningSock = false, bool epoll_et = true);
+	bool registerRead(SocketInterface* obj, const bool& isListeningSock = false, bool epoll_et = true, bool isNonBlocking = false);
 	bool unRegisterRead(const SOCKET& descriptor);
 	void* getOptData(const int& index);
 	void reRegisterServerSock(void* obj);
diff --git a/src/modules/server-util/SocketInterface.h b/src/modules/server-util/SocketInterface.h
index 15e04a77c..abc3f31d7 100644
--- a/src/modules/server-util/SocketInterface.h
+++ b/src/modules/server-util/SocketInterface.h
@@ -62,7 +62,7 @@ class EventHandler {
 	virtual bool unRegisterWrite(SocketInterface* obj)=0;
 	virtual bool unRegisterRead(const SOCKET& descriptor)=0;
 	virtual bool registerWrite(SocketInterface* obj)=0;
-	virtual bool registerRead(SocketInterface* obj, const bool& isListeningSock = false, bool epoll_et = true)=0;
+	virtual bool registerRead(SocketInterface* obj, const bool& isListeningSock = false, bool epoll_et = true, bool isNonBlocking = false)=0;
 #if defined(USE_IO_URING)
 	virtual void post_write(SocketInterface* sfd, const std::string& data)=0;
 	virtual void post_read(SocketInterface* sfd)=0;
diff --git a/src/server/embedded/CHServer.cpp b/src/server/embedded/CHServer.cpp
index 054920b49..55fc28d5b 100644
--- a/src/server/embedded/CHServer.cpp
+++ b/src/server/embedded/CHServer.cpp
@@ -25,7 +25,9 @@
 
 #include "CHServer.h"
 
-static std::string servd, serverCntrlFileNm;
+std::string CHServer::serverCntrlFileNm;
+
+static std::string servd;
 static bool isSSLEnabled = false, isThreadprq = false, processforcekilled = false,
 		processgendone = false, isCompileEnabled = false;
 static int preForked = 5;
@@ -314,11 +316,11 @@ void* service(void* arg)
 	return NULL;
 }
 
-void* gracefullShutdown_monitor(void* args)
+void* CHServer::gracefullShutdown_monitor(void* args)
 {
 	std::string* ipaddr = (std::string*)args;
 	struct stat buffer;
-	while(stat (serverCntrlFileNm.c_str(), &buffer) == 0)
+	while(stat (CHServer::serverCntrlFileNm.c_str(), &buffer) == 0)
 	{
 		Thread::sSleep(1);
 	}
@@ -350,7 +352,7 @@ void* CHServer::dynamic_page_monitor(void* arg)
 	std::map<std::string, std::string, std::less<> > dcspstpes = dcpsss;
 	dcspstpes.insert(tpes.begin(), tpes.end());
 	std::map<std::string,long> statsinf;
-	std::map<std::string, std::string>::iterator it;
+	std::map<std::string, std::string, std::less<>>::iterator it;
 	for(it=dcspstpes.begin();it!=dcspstpes.end();++it)
 	{
 		stat(it->first.c_str(), &statbuf);
@@ -1039,7 +1041,7 @@ int CHServer::entryPoint(int vhostNum, bool isMain, std::string serverRootDirect
 										}
 									}
 								}
-								std::map<std::string, bool>::iterator ucit;
+								std::map<std::string, bool, std::less<>>::iterator ucit;
 								for(ucit=updatedcontextNames.begin();ucit!=updatedcontextNames.end();ucit++)
 								{
 									if(ConfigurationData::getInstance()->servingContexts.find(ucit->first)!=
@@ -1157,13 +1159,13 @@ void CHServer::serve(std::string port, std::string ipaddr, int thrdpsiz, std::st
 	{
 		if(vhostNumber==0)
 		{
-			std::map<std::string, bool>::iterator it;
+			std::map<std::string, bool, std::less<>>::iterator it;
 			for (it=ConfigurationData::getInstance()->servingContexts.begin();it!=ConfigurationData::getInstance()->servingContexts.end();++it)
 				logger << ("Server (" +  ipport  + ") serves context (" +  it->first  + ")") << std::endl;
 		}
 		else
 		{
-			std::map<std::string, bool>::iterator it;
+			std::map<std::string, bool, std::less<>>::iterator it;
 			for (it=ConfigurationData::getInstance()->servingContexts.begin();it!=ConfigurationData::getInstance()->servingContexts.end();++it)
 				logger << ("Virtual-Host (" +  ipport  + ") serves context (" +  it->first  + ")") << std::endl;
 		}
@@ -1231,6 +1233,11 @@ void CHServer::serve(std::string port, std::string ipaddr, int thrdpsiz, std::st
 	reader.registerSocketInterfaceFactory(&CHServer::createSocketInterface);
 	reader.startNL(-1);
 
+	std::ofstream serverCntrlFileo;
+	serverCntrlFileo.open(serverCntrlFileNm.c_str());
+	serverCntrlFileo << "Server Running" << std::endl;
+	serverCntrlFileo.close();
+
 #ifdef INC_SDORM
 	logger << ("Initializing DataSources....") << std::endl;
 	ConfigurationHandler::initializeDataSources();
@@ -1241,14 +1248,22 @@ void CHServer::serve(std::string port, std::string ipaddr, int thrdpsiz, std::st
 	ConfigurationHandler::initializeCaches();
 	logger << ("Initializing Caches done....") << std::endl;
 
+	//struct sockaddr_storage their_addr; // connector's address information
+	//socklen_t sin_size;
+	SOCKET sockfd = Server::createListener(ipaddr, CastUtil::toInt(port), true, isSinglEVH);
+	if(sockfd==-1)
+	{
+		logger << "Unable to start the server on the specified ip/port..." << std::endl;
+		return;
+	}
+	reader.addListenerSocket(&doRegisterListenerFunc, sockfd);
+
 #ifdef INC_JOBS
 	if(StringUtil::toLowerCopy(ConfigurationData::getInstance()->coreServerProperties.sprops["ENABLE_JOBS"])=="true") {
 		JobScheduler::start();
 	}
 #endif
 
-	std::vector<std::string> files;
-
 #ifdef INC_DCP
 	if(isCompileEnabled)
 	{
@@ -1257,28 +1272,8 @@ void CHServer::serve(std::string port, std::string ipaddr, int thrdpsiz, std::st
 	}
 #endif
 
-	SOCKET sockfd;  // listen on sock_fd, new connection on new_fd
-
-	//struct sockaddr_storage their_addr; // connector's address information
-	//socklen_t sin_size;
-
-	sockfd = Server::createListener(ipaddr, CastUtil::toInt(port), true, isSinglEVH);
-
-	if(sockfd==-1)
-	{
-		logger << "Unable to start the server on the specified ip/port..." << std::endl;
-		return;
-	}
-
-	reader.addListenerSocket(sockfd);
-
 	//printf("server: waiting for connections...\n");
-	logger.info("Server: waiting for connections on " + ipport);
-
-	std::ofstream serverCntrlFileo;
-	serverCntrlFileo.open(serverCntrlFileNm.c_str());
-	serverCntrlFileo << "Server Running" << std::endl;
-	serverCntrlFileo.close();
+	logger.write("Server: waiting for connections on %s\n", ipport.c_str());
 
 	//Sleep for some time so as to make sure all the new child processes are set correctly
 	//and all init is complete...
@@ -1399,3 +1394,8 @@ SocketInterface* CHServer::createSocketInterface(SOCKET fd) {
 		techunkSiz, connKeepAlive*1000, maxReqHdrCnt, maxEntitySize);
 #endif
 }
+
+bool CHServer::doRegisterListenerFunc() {
+	struct stat buffer;
+	return stat (serverCntrlFileNm.c_str(), &buffer)==0 && CacheManager::isInitCompleted() && DataSourceManager::isInitCompleted();
+}
diff --git a/src/server/embedded/CHServer.h b/src/server/embedded/CHServer.h
index c09969bbb..8e597b327 100644
--- a/src/server/embedded/CHServer.h
+++ b/src/server/embedded/CHServer.h
@@ -174,10 +174,13 @@ typedef void (*ReceiveTask1)(const int&);
 
 class CHServer {
 	static int techunkSiz, connKeepAlive, maxReqHdrCnt, maxEntitySize;
+	static std::string serverCntrlFileNm;
 	static HttpServiceTask* httpServiceFactoryMethod();
 	static HttpReadTask* httpReadFactoryMethod();
 	static unsigned int hardware_concurrency();
+	static void* gracefullShutdown_monitor(void* args);
 public:
+	static bool doRegisterListenerFunc();
 	static SocketInterface* createSocketInterface(SOCKET);
 	static void* dynamic_page_monitor(void* arg);
 	static void serve(std::string port, std::string ipaddr, int thrdpsiz, std::string serverRootDirectory, propMap sprops, int vhostNumber);
diff --git a/web/te-benchmark-um-mgr/src/TeBkUmMgr.cpp b/web/te-benchmark-um-mgr/src/TeBkUmMgr.cpp
index 55a5d7d70..520e55df5 100644
--- a/web/te-benchmark-um-mgr/src/TeBkUmMgr.cpp
+++ b/web/te-benchmark-um-mgr/src/TeBkUmMgr.cpp
@@ -214,6 +214,7 @@ void TeBkUmMgrRouter::updateCache() {
 			cchi->setRaw(CastUtil::fromNumber(w.getId()), str);
 		}
 		CacheManager::cleanImpl(cchi);
+		CacheManager::triggerAppInitCompletion();
 	} catch(const std::exception& e) {
 		CacheManager::cleanImpl(cchi);
 		throw e;
diff --git a/web/te-benchmark-um-pq-async/include/TeBkUmLpqAsync.h b/web/te-benchmark-um-pq-async/include/TeBkUmLpqAsync.h
index 47d02d340..8efc489e8 100644
--- a/web/te-benchmark-um-pq-async/include/TeBkUmLpqAsync.h
+++ b/web/te-benchmark-um-pq-async/include/TeBkUmLpqAsync.h
@@ -101,8 +101,6 @@ class TeBkUmLpqAsyncRouter : public Router {
 	static std::string APP_NAME;
 	static std::string TPE_FN_NAME;
 
-	std::atomic<bool> which = { false };
-
 	static bool strToNum(const char* str, int len, int& ret);
 
 	void dbAsync(AsyncReq* req);
@@ -139,13 +137,12 @@ class TeBkUmLpqAsyncRouter : public Router {
 	static std::map<int, std::string> _qC;
 	LibpqDataSourceImpl* sqli;
 	LibpqDataSourceImpl* getDb();
+	//static Logger logger;
 public:
 	TeBkUmLpqAsyncRouter& operator=(const TeBkUmLpqAsyncRouter& a) {
-		which = false;
 		return *this;
 	}
 	TeBkUmLpqAsyncRouter(const TeBkUmLpqAsyncRouter& a) {
-		which = false;
 		sqli = NULL;
 	}
 	TeBkUmLpqAsyncRouter();
diff --git a/web/te-benchmark-um-pq-async/src/TeBkUmLpqAsync.cpp b/web/te-benchmark-um-pq-async/src/TeBkUmLpqAsync.cpp
index 1647947fa..46fc349ed 100644
--- a/web/te-benchmark-um-pq-async/src/TeBkUmLpqAsync.cpp
+++ b/web/te-benchmark-um-pq-async/src/TeBkUmLpqAsync.cpp
@@ -88,6 +88,7 @@ std::string TeBkUmLpqAsyncRouter::WORLD = "world";
 std::string TeBkUmLpqAsyncRouter::WORLD_ONE_QUERY = "select id, randomnumber from world where id = $1";
 std::string TeBkUmLpqAsyncRouter::WORLD_ALL_QUERY = "select id, randomnumber from world";
 std::string TeBkUmLpqAsyncRouter::FORTUNE_ALL_QUERY = "select id, message from fortune";
+//Logger TeBkUmLpqAsyncRouter::logger = LoggerFactory::getLogger("TeBkUmLpqAsync");
 std::map<int, std::string> TeBkUmLpqAsyncRouter::_qC;
 
 void TeBkUmLpqAsyncRouter::dbAsync(AsyncReq* req) {
@@ -98,6 +99,7 @@ void TeBkUmLpqAsyncRouter::dbAsync(AsyncReq* req) {
 		std::vector<LibpqParam> pars;
 		LibpqDataSourceImpl::ADD_INT4(pars, rid);
 		void* areq = sqli->executeQueryAsync(WORLD_ONE_QUERY, std::move(pars), req, &TeBkUmLpqAsyncRouter::dbAsyncUtil, &TeBkUmLpqAsyncRouter::dbAsyncCh, NULL);
+		//logger << ("in API /db added to PG\n");
 		sqli->completeAsync(areq);
 	} catch(const std::exception& e) {
 		throw e;
@@ -108,6 +110,7 @@ void TeBkUmLpqAsyncRouter::dbAsyncUtil(void* ctx, int rn, int cn, char * d) {
 	TeBkUmLpqAsyncWorld* w = (TeBkUmLpqAsyncWorld*)req->d;
 	if(cn==0)w->setId(ntohl(*((uint32_t *) d)));
 	if(cn==1)w->setRandomNumber(ntohl(*((uint32_t *) d)));
+	//logger << ("in API /db received row from PG\n");
 }
 void TeBkUmLpqAsyncRouter::dbAsyncCh(void* ctx, bool status, const std::string& q, int counter) {
 	AsyncReq* req = (AsyncReq*)ctx;
@@ -117,8 +120,10 @@ void TeBkUmLpqAsyncRouter::dbAsyncCh(void* ctx, bool status, const std::string&
 	JSONSerialize::serializeUnknown(w, 0, "TeBkUmLpqAsyncWorld", &c, APP_NAME);
 	std::string d;
 	req->r.generateHeadResponse(d, ContentTypes::CONTENT_TYPE_APPLICATION_JSON, (int)c.length());
-	req->sif->writeDirect(d);
-	req->sif->writeDirect(c);
+	int st = req->sif->writeDirect(d);
+	//logger.write("in API /db completion writeDirect headers to sock %d\n", st);
+	st = req->sif->writeDirect(c);
+	//logger.write("in API /db completion writeDirect data to sock %d\n", st);
 	req->sif->unUse();
 	delete w;
 	delete req;
@@ -462,6 +467,7 @@ void TeBkUmLpqAsyncRouter::updateCacheAsyncCh(void* ctx, bool status, const std:
 		delete wlist;
 		CacheManager::cleanImpl(cchi);
 		delete req;
+		CacheManager::triggerAppInitCompletion("te-benchmark-um-pq-async");
 	} catch(const std::exception& e) {
 		delete wlist;
 		CacheManager::cleanImpl(cchi);
diff --git a/web/te-benchmark-um-pq/src/TeBkUmLpq.cpp b/web/te-benchmark-um-pq/src/TeBkUmLpq.cpp
index 509fa4015..d8e7643c5 100644
--- a/web/te-benchmark-um-pq/src/TeBkUmLpq.cpp
+++ b/web/te-benchmark-um-pq/src/TeBkUmLpq.cpp
@@ -330,6 +330,7 @@ void TeBkUmLpqRouter::updateCache() {
 			cchi->setRaw(CastUtil::fromNumber(w.getId()), str);
 		}
 		CacheManager::cleanImpl(cchi);
+		CacheManager::triggerAppInitCompletion();
 	} catch(const std::exception& e) {
 		CacheManager::cleanImpl(cchi);
 		throw e;
diff --git a/web/te-benchmark-um/src/TeBkUm.cpp b/web/te-benchmark-um/src/TeBkUm.cpp
index 4f3284461..365cc47c9 100644
--- a/web/te-benchmark-um/src/TeBkUm.cpp
+++ b/web/te-benchmark-um/src/TeBkUm.cpp
@@ -153,6 +153,7 @@ void TeBkUmRouter::updateCache() {
 		}
 		DataSourceManager::cleanImpl(sqli);
 		CacheManager::cleanImpl(cchi);
+		CacheManager::triggerAppInitCompletion();
 	} catch(const std::exception& e) {
 		DataSourceManager::cleanImpl(sqli);
 		CacheManager::cleanImpl(cchi);
diff --git a/web/te-benchmark/src/TeBkRestController.cpp b/web/te-benchmark/src/TeBkRestController.cpp
index 06eaa5a9f..12d17e3a0 100644
--- a/web/te-benchmark/src/TeBkRestController.cpp
+++ b/web/te-benchmark/src/TeBkRestController.cpp
@@ -147,6 +147,7 @@ void TeBkRestController::updateCache() {
 		}
 		DataSourceManager::cleanImpl(sqli);
 		CacheManager::cleanImpl(cchi);
+		CacheManager::triggerAppInitCompletion();
 	} catch(const std::exception& e) {
 		DataSourceManager::cleanImpl(sqli);
 		CacheManager::cleanImpl(cchi);