Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 12865 invoked from network); 26 Aug 2009 16:57:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Aug 2009 16:57:04 -0000 Received: (qmail 26023 invoked by uid 500); 26 Aug 2009 16:57:04 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 25979 invoked by uid 500); 26 Aug 2009 16:57:04 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 25963 invoked by uid 99); 26 Aug 2009 16:57:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Aug 2009 16:57:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Aug 2009 16:57:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DA054238890A; Wed, 26 Aug 2009 16:56:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r808122 - in /hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred: JobTracker.java TaskTracker.java Date: Wed, 26 Aug 2009 16:56:39 -0000 To: mapreduce-commits@hadoop.apache.org From: stevel@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090826165639.DA054238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stevel Date: Wed Aug 26 16:56:39 2009 New Revision: 808122 URL: http://svn.apache.org/viewvc?rev=808122&view=rev Log: MAPREDUCE-233 SFOS-1270 strip the ping operation from the service lifecycle proposal. Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=808122&r1=808121&r2=808122&view=diff ============================================================================== --- hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java (original) +++ hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java Wed Aug 26 16:56:39 2009 @@ -2218,26 +2218,6 @@ ///////////////////////////////////////////////////// /** - * {@inheritDoc} - * - * @param status a status that can be updated with problems - * @throws IOException for any problem - */ - @Override - public void innerPing(ServiceStatus status) throws IOException { - if (infoServer == null || !infoServer.isAlive()) { - status.addThrowable( - new IOException("TaskTracker HttpServer is not running on port " - + infoPort)); - } - if (interTrackerServer == null) { - status.addThrowable( - new IOException("InterTrackerServer is not running on port " - + port )); - } - } - - /** * This service shuts down by stopping the * {@link JobEndNotifier} and then closing down the job * tracker Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=808122&r1=808121&r2=808122&view=diff ============================================================================== --- hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java Wed Aug 26 16:56:39 2009 @@ -1151,26 +1151,6 @@ ///////////////////////////////////////////////////// /** - * {@inheritDoc} - * - * @param status a status that can be updated with problems - * @throws IOException for any problem - */ - @Override - public void innerPing(ServiceStatus status) throws IOException { - if (server == null || !server.isAlive()) { - status.addThrowable( - new IOException("TaskTracker HttpServer is not running on port " - + httpPort)); - } - if (taskReportServer == null) { - status.addThrowable( - new IOException("TaskTracker Report Server is not running on " - + taskReportAddress)); - } - } - - /** * A shutdown request triggers termination * @throws IOException when errors happen during termination */