You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2015/05/01 18:55:44 UTC
svn commit: r1677182 - in /uima/sandbox/uima-ducc/trunk/src/main/admin:
check_ducc ducc_util.py
Author: challngr
Date: Fri May 1 16:55:44 2015
New Revision: 1677182
URL: http://svn.apache.org/r1677182
Log:
UIMA-4358 Handle banners and motd stuff in ssh. Handle 'not a tty' noise from ssh if mesg n is specified.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc?rev=1677182&r1=1677181&r2=1677182&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc Fri May 1 16:55:44 2015
@@ -112,6 +112,12 @@ class CheckDucc(DuccUtil):
if ( 'signal' in line ):
response = "Node health did not complete: " + line
self.badnodes.append(node)
+ # these next two filter junk if 'mesg' is running in a shell rc
+ if ( 'stdin: is not a tty' in line ):
+ continue
+ if ( 'mesg' in line ):
+ continue
+
if ( not line ):
break
line = line.strip()
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1677182&r1=1677181&r2=1677182&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Fri May 1 16:55:44 2015
@@ -226,9 +226,9 @@ class DuccUtil(DuccBase):
cmd = ' '.join(CMD)
#print 'ssh -o BatchMode=yes -o ConnectTimeout=10', host, cmd
if ( do_wait ):
- return self.popen('ssh -o BatchMode=yes -o ConnectTimeout=10', host, cmd)
+ return self.popen('ssh -q -o BatchMode=yes -o ConnectTimeout=10', host, cmd)
else:
- return self.spawn('ssh -o BatchMode=yes -o ConnectTimeout=10', host, cmd)
+ return self.spawn('ssh -q -o BatchMode=yes -o ConnectTimeout=10', host, cmd)
def set_classpath(self):