svn commit: r1085124 - in /hadoop/common/branches/branch-0.22: ./ src/java/org/apache/hadoop/metrics/ganglia/ src/test/core/org/apache/hadoop/metrics/ganglia/

[sz...@apache.org]

Author: szetszwo
Date: Thu Mar 24 20:40:54 2011
New Revision: 1085124

URL: http://svn.apache.org/viewvc?rev=1085124&view=rev
Log:
HADOOP-7187. Fix socket leak in GangliaContext.  Contributed by Uma Maheswara Rao G

Added:
    hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/
    hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java
Modified:
    hadoop/common/branches/branch-0.22/CHANGES.txt
    hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java

Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1085124&r1=1085123&r2=1085124&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Thu Mar 24 20:40:54 2011
@@ -480,6 +480,9 @@ Release 0.21.1 - Unreleased
     HADOOP-7174. Null is displayed in the "fs -copyToLocal" command.
     (Uma Maheswara Rao G via szetszwo)
 
+    HADOOP-7187. Fix socket leak in GangliaContext.  (Uma Maheswara Rao G
+    via szetszwo)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java?rev=1085124&r1=1085123&r2=1085124&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java (original)
+++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Thu Mar 24 20:40:54 2011
@@ -112,6 +112,17 @@ public class GangliaContext extends Abst
     }
   }
 
+    /**
+   * method to close the datagram socket
+   */
+  @Override
+  public void close() {
+    super.close();
+    if (datagramSocket != null) {
+      datagramSocket.close();
+    }
+  }
+  
   @InterfaceAudience.Private
   public void emitRecord(String contextName, String recordName,
     OutputRecord outRec) 

Added: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java?rev=1085124&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java (added)
+++ hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java Thu Mar 24 20:40:54 2011
@@ -0,0 +1,42 @@
+/*
+ * TestGangliaContext.java
+ *
+ * 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.
+ */
+
+
+package org.apache.hadoop.metrics.ganglia;
+
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.metrics.ContextFactory;
+import org.apache.hadoop.metrics.spi.AbstractMetricsContext;
+
+public class TestGangliaContext {
+  
+  @Test
+  public void testCloseShouldCloseTheSocketWhichIsCreatedByInit() throws Exception {
+    AbstractMetricsContext context=new GangliaContext();
+    context.init("gangliaContext", ContextFactory.getFactory());
+    GangliaContext gangliaContext =(GangliaContext) context;
+    assertFalse("Socket already closed",gangliaContext.datagramSocket.isClosed());
+    context.close();
+    assertTrue("Socket not closed",gangliaContext.datagramSocket.isClosed());
+  }
+}