From owner-cvs-src-old@FreeBSD.ORG Sat May 1 19:16:25 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 04203106568F for ; Sat, 1 May 2010 19:16:25 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4CE38FC0A for ; Sat, 1 May 2010 19:16:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41JGOaX062551 for ; Sat, 1 May 2010 19:16:24 GMT (envelope-from pjd@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41JGOFl062550 for cvs-src-old@freebsd.org; Sat, 1 May 2010 19:16:24 GMT (envelope-from pjd@repoman.freebsd.org) Message-Id: <201005011916.o41JGOFl062550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to pjd@repoman.freebsd.org using -f From: Pawel Jakub Dawidek Date: Sat, 1 May 2010 19:16:08 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sbin/hastd Makefile hast.conf.5 hast.h hast_proto.c hastd.c metadata.c parse.y primary.c proto.c proto.h proto_common.c proto_tcp4.c secondary.c token.l X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 19:16:25 -0000 pjd 2010-05-01 19:16:08 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sbin/hastd Makefile hast.conf.5 hast.h hast_proto.c hastd.c metadata.c parse.y primary.c proto.c proto.h proto_common.c proto_tcp4.c secondary.c token.l Log: SVN rev 207479 on 2010-05-01 19:16:08Z by pjd MFC r207070,r207343,r207345,r207347,r207348,r207371,r207372,r207390: r207070: Fix compilation with WITHOUT_CRYPT or WITHOUT_OPENSSL options. Reported by: Andrei V. Lavreniyuk r207343: Don't assume that "resource" property is in metadata. Reported by: Mikolaj Golub r207345: Use WEXITSTATUS() to obtain real exit code. r207347: Mark temporary issues as such. r207348: Restart worker thread only if the problem was temporary. In case of persistent problem we don't want to loop forever. r207371: Fix a problem where hastd will stuck in recv(2) after sending request to secondary, which died between send(2) and recv(2). Do it by adding timeout to recv(2) for primary incoming and outgoing sockets and secondary outgoing socket. Reported by: Mikolaj Golub Tested by: Mikolaj Golub r207372: - Check if the worker process was killed by signal and restart it. - Improve logging. Pointed out by: Garrett Cooper r207390: Default connection timeout is way too long. To make it shorter we have to make socket non-blocking, connect() and if we get EINPROGRESS, we have to wait using select(). Very complex, but I know no other way to define connection timeout for a given socket. Reported by: hiroshi@soupacific.com Revision Changes Path 1.3.2.4 +7 -3 src/sbin/hastd/Makefile 1.1.2.3 +7 -0 src/sbin/hastd/hast.conf.5 1.1.2.3 +3 -0 src/sbin/hastd/hast.h 1.1.2.3 +8 -0 src/sbin/hastd/hast_proto.c 1.2.2.4 +38 -19 src/sbin/hastd/hastd.c 1.1.2.3 +1 -1 src/sbin/hastd/metadata.c 1.1.2.3 +31 -1 src/sbin/hastd/parse.y 1.3.2.4 +8 -2 src/sbin/hastd/primary.c 1.1.2.3 +26 -0 src/sbin/hastd/proto.c 1.1.2.3 +1 -0 src/sbin/hastd/proto.h 1.1.2.3 +2 -2 src/sbin/hastd/proto_common.c 1.1.2.3 +75 -3 src/sbin/hastd/proto_tcp4.c 1.1.2.3 +6 -0 src/sbin/hastd/secondary.c 1.1.2.3 +1 -0 src/sbin/hastd/token.l