Updated Branches: refs/heads/4.2 35b4ab460 -> e37318a49
CLOUDSTACK-4184 updated the socat in password server for handling parallel requests in parallel vm deployments Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e37318a4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e37318a4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e37318a4 Branch: refs/heads/4.2 Commit: e37318a492405cba4c62ba3b9f27aa963107b81c Parents: 35b4ab4 Author: Jayapal <[email protected]> Authored: Tue Aug 13 12:47:41 2013 +0530 Committer: Jayapal <[email protected]> Committed: Tue Aug 13 12:48:27 2013 +0530 ---------------------------------------------------------------------- patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip | 2 +- patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e37318a4/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip index 8d62dff..4622860 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip +++ b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip @@ -20,7 +20,7 @@ addr=$1; while [ "$ENABLED" == "1" ] do - socat -lf /var/log/cloud.log TCP4-LISTEN:8080,reuseaddr,crnl,bind=$addr SYSTEM:"/opt/cloud/bin/serve_password.sh \"\$SOCAT_PEERADDR\"" + socat -lf /var/log/cloud.log TCP4-LISTEN:8080,reuseaddr,fork,crnl,bind=$addr SYSTEM:"/opt/cloud/bin/serve_password.sh \"\$SOCAT_PEERADDR\"" rc=$? if [ $rc -ne 0 ] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e37318a4/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh b/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh index b829b54..a3a2732 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh @@ -62,7 +62,7 @@ do break fi - request=$(echo $input | grep "DomU_Request:" | cut -d: -f2 | sed 's/^[ \t]*//') + request=$(echo "$input" | grep "DomU_Request:" | cut -d: -f2 | sed 's/^[ \t]*//') if [ "$request" != "" ] then
