Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: commits@trafodion.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sureshs@apache.org
To: commits@trafodion.incubator.apache.org
Date: Wed, 28 Sep 2016 18:34:15 -0000
Message-Id: <4150f55d7c4e436a977a8a83f57e7ebb@git.apache.org>
Subject: [1/4] incubator-trafodion git commit: [TRAFODION-2235] Added sync
 thread epoll timeout logic and Zookeeper client thread to the monitor
archived-at: Wed, 28 Sep 2016 18:34:26 -0000

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master addb9b18d -> 1e9488208


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c7788c05/core/sqf/monitor/linux/zootest.h
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/zootest.h b/core/sqf/monitor/linux/zootest.h
new file mode 100644
index 0000000..90069a5
--- /dev/null
+++ b/core/sqf/monitor/linux/zootest.h
@@ -0,0 +1,34 @@
+/**********************************************************************
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (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.
+//
+// @@@ END COPYRIGHT @@@
+********************************************************************/
+
+#ifndef ZOOTEST_H_
+#define ZOOTEST_H_
+
+#define MON_ZOOCLIENT_MAIN_1                101380101
+#define MON_ZOOCLIENT_MAIN_2                101380102
+#define MON_ZOOCLIENT_MAIN_3                101380103
+#define MON_ZOOCLIENT_MAIN_4                101380104
+#define MON_ZOOCLIENT_MAIN_5                101380105
+#define MON_ZOOCLIENT_MAIN_6                101380106
+
+#endif // ZOOTEST_H_

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c7788c05/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 8d33250..6409b35 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -676,14 +676,27 @@ export SQ_MON_ALTLOG=0
 # Monitor sync thread responsiveness timeout
 # default 15 mins
 export SQ_MON_SYNC_TIMEOUT=900
+
 export SQ_MON_KEEPALIVE=1
 export SQ_MON_KEEPIDLE=60
 export SQ_MON_KEEPINTVL=6
 export SQ_MON_KEEPCNT=5
 
-# The wait timeout is in seconds
-export SQ_MON_EPOLL_WAIT_TIMEOUT=12
-export SQ_MON_EPOLL_RETRY_COUNT=15
+# Monitor sync thread epoll wait timeout is in seconds
+# Currently set to 45 seconds
+export SQ_MON_EPOLL_WAIT_TIMEOUT=15
+export SQ_MON_EPOLL_RETRY_COUNT=3
+
+# Monitor Zookeeper client
+#  - A zero value disables the zclient logic in the monitor process.
+#    It is enabled by default in a real cluster, disabled otherwise.
+#      (must be disabled to debug monitor processes in a real cluster)
+#export SQ_MON_ZCLIENT_ENABLED=0
+#  - Session timeout in seconds defines when Zookeeper quorum determines a
+#    non-responsive monitor zclient which results in a Trafodion node down. 
+#    Default is 60 seconds (1 minute) which is the maximum Zookeeper allows.
+#      (15 seconds longer than EPOLL timeout above).
+#export SQ_MON_ZCLIENT_SESSION_TIMEOUT=60
 
 # set to 0 to disable phandle verifier
 export SQ_PHANDLE_VERIFIER=1