Index: src/java/org/apache/hama/bsp/TaskInProgress.java =================================================================== --- src/java/org/apache/hama/bsp/TaskInProgress.java (리비전 1023616) +++ src/java/org/apache/hama/bsp/TaskInProgress.java (작업 사본) @@ -162,7 +162,7 @@ return (completes > 0); } - private TreeSet tasksReportedClosed = new TreeSet(); + private TreeSet tasksReportedClosed = new TreeSet(); public boolean shouldCloseForClosedJob(String taskid) { TaskStatus ts = (TaskStatus) taskStatuses.get(taskid); Index: src/test/org/apache/hama/HamaClusterTestCase.java =================================================================== --- src/test/org/apache/hama/HamaClusterTestCase.java (리비전 1023616) +++ src/test/org/apache/hama/HamaClusterTestCase.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama; import java.io.File; Index: src/test/org/apache/hama/HamaTestCase.java =================================================================== --- src/test/org/apache/hama/HamaTestCase.java (리비전 1023616) +++ src/test/org/apache/hama/HamaTestCase.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama; import java.io.File; Index: src/test/org/apache/hama/MiniBSPCluster.java =================================================================== --- src/test/org/apache/hama/MiniBSPCluster.java (리비전 1023616) +++ src/test/org/apache/hama/MiniBSPCluster.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama; import java.util.List; Index: src/test/org/apache/hama/bsp/TestBSPPeer.java =================================================================== --- src/test/org/apache/hama/bsp/TestBSPPeer.java (리비전 1023616) +++ src/test/org/apache/hama/bsp/TestBSPPeer.java (작업 사본) @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hama.bsp; import java.io.IOException; Index: src/test/org/apache/hama/bsp/TestClusterStatus.java =================================================================== --- src/test/org/apache/hama/bsp/TestClusterStatus.java (리비전 1023616) +++ src/test/org/apache/hama/bsp/TestClusterStatus.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama.bsp; import java.io.IOException; Index: src/test/org/apache/hama/bsp/TestSerializePrinting.java =================================================================== --- src/test/org/apache/hama/bsp/TestSerializePrinting.java (리비전 1023616) +++ src/test/org/apache/hama/bsp/TestSerializePrinting.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama.bsp; import java.io.IOException; Index: src/test/org/apache/hama/ipc/TestIPC.java =================================================================== --- src/test/org/apache/hama/ipc/TestIPC.java (리비전 0) +++ src/test/org/apache/hama/ipc/TestIPC.java (리비전 0) @@ -0,0 +1,232 @@ +/** + * 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.hama.ipc; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Random; + +import junit.framework.TestCase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.ipc.Client; +import org.apache.hadoop.ipc.Server; +import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.util.StringUtils; + +public class TestIPC extends TestCase { + public static final Log LOG = LogFactory.getLog(TestIPC.class); + + final private static Configuration conf = new Configuration(); + final static private int PING_INTERVAL = 1000; + + static { + Client.setPingInterval(conf, PING_INTERVAL); + } + + public TestIPC(String name) { + super(name); + } + + private static final Random RANDOM = new Random(); + + private static final String ADDRESS = "0.0.0.0"; + + private static class TestServer extends Server { + private boolean sleep; + + public TestServer(int handlerCount, boolean sleep) throws IOException { + super(ADDRESS, 0, LongWritable.class, handlerCount, conf); + this.sleep = sleep; + } + + @Override + public Writable call(Class protocol, Writable param, long receiveTime) + throws IOException { + if (sleep) { + try { + Thread.sleep(RANDOM.nextInt(2 * PING_INTERVAL)); // sleep a bit + } catch (InterruptedException e) { + } + } + return param; // echo param as result + } + } + + private static class SerialCaller extends Thread { + private Client client; + private InetSocketAddress server; + private int count; + private boolean failed; + + public SerialCaller(Client client, InetSocketAddress server, int count) { + this.client = client; + this.server = server; + this.count = count; + } + + public void run() { + for (int i = 0; i < count; i++) { + try { + LongWritable param = new LongWritable(RANDOM.nextLong()); + LongWritable value = (LongWritable) client.call(param, server, null, + null); + if (!param.equals(value)) { + LOG.fatal("Call failed!"); + failed = true; + break; + } + } catch (Exception e) { + LOG.fatal("Caught: " + StringUtils.stringifyException(e)); + failed = true; + } + } + } + } + + private static class ParallelCaller extends Thread { + private Client client; + private int count; + private InetSocketAddress[] addresses; + private boolean failed; + + public ParallelCaller(Client client, InetSocketAddress[] addresses, + int count) { + this.client = client; + this.addresses = addresses; + this.count = count; + } + + public void run() { + for (int i = 0; i < count; i++) { + try { + Writable[] params = new Writable[addresses.length]; + for (int j = 0; j < addresses.length; j++) + params[j] = new LongWritable(RANDOM.nextLong()); + Writable[] values = client.call(params, addresses, null, null); + for (int j = 0; j < addresses.length; j++) { + if (!params[j].equals(values[j])) { + LOG.fatal("Call failed!"); + failed = true; + break; + } + } + } catch (Exception e) { + LOG.fatal("Caught: " + StringUtils.stringifyException(e)); + failed = true; + } + } + } + } + + public void testSerial() throws Exception { + testSerial(3, false, 2, 5, 100); + } + + public void testSerial(int handlerCount, boolean handlerSleep, + int clientCount, int callerCount, int callCount) throws Exception { + Server server = new TestServer(handlerCount, handlerSleep); + InetSocketAddress addr = NetUtils.getConnectAddress(server); + server.start(); + + Client[] clients = new Client[clientCount]; + for (int i = 0; i < clientCount; i++) { + clients[i] = new Client(LongWritable.class, conf); + } + + SerialCaller[] callers = new SerialCaller[callerCount]; + for (int i = 0; i < callerCount; i++) { + callers[i] = new SerialCaller(clients[i % clientCount], addr, callCount); + callers[i].start(); + } + for (int i = 0; i < callerCount; i++) { + callers[i].join(); + assertFalse(callers[i].failed); + } + for (int i = 0; i < clientCount; i++) { + clients[i].stop(); + } + server.stop(); + } + + public void testParallel() throws Exception { + testParallel(10, false, 2, 4, 2, 4, 100); + } + + public void testParallel(int handlerCount, boolean handlerSleep, + int serverCount, int addressCount, int clientCount, int callerCount, + int callCount) throws Exception { + Server[] servers = new Server[serverCount]; + for (int i = 0; i < serverCount; i++) { + servers[i] = new TestServer(handlerCount, handlerSleep); + servers[i].start(); + } + + InetSocketAddress[] addresses = new InetSocketAddress[addressCount]; + for (int i = 0; i < addressCount; i++) { + addresses[i] = NetUtils.getConnectAddress(servers[i % serverCount]); + } + + Client[] clients = new Client[clientCount]; + for (int i = 0; i < clientCount; i++) { + clients[i] = new Client(LongWritable.class, conf); + } + + ParallelCaller[] callers = new ParallelCaller[callerCount]; + for (int i = 0; i < callerCount; i++) { + callers[i] = new ParallelCaller(clients[i % clientCount], addresses, + callCount); + callers[i].start(); + } + for (int i = 0; i < callerCount; i++) { + callers[i].join(); + assertFalse(callers[i].failed); + } + for (int i = 0; i < clientCount; i++) { + clients[i].stop(); + } + for (int i = 0; i < serverCount; i++) { + servers[i].stop(); + } + } + + public void testStandAloneClient() throws Exception { + testParallel(10, false, 2, 4, 2, 4, 100); + Client client = new Client(LongWritable.class, conf); + InetSocketAddress address = new InetSocketAddress("127.0.0.1", 10); + try { + client.call(new LongWritable(RANDOM.nextLong()), address, null, null); + fail("Expected an exception to have been thrown"); + } catch (IOException e) { + String message = e.getMessage(); + String addressText = address.toString(); + assertTrue("Did not find " + addressText + " in " + message, message + .contains(addressText)); + Throwable cause = e.getCause(); + assertNotNull("No nested exception in " + e, cause); + String causeText = cause.getMessage(); + assertTrue("Did not find " + causeText + " in " + message, message + .contains(causeText)); + } + } + +} Index: src/test/org/apache/hama/ipc/TestRPC.java =================================================================== --- src/test/org/apache/hama/ipc/TestRPC.java (리비전 0) +++ src/test/org/apache/hama/ipc/TestRPC.java (리비전 0) @@ -0,0 +1,173 @@ +/** + * 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.hama.ipc; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.InetSocketAddress; +import java.util.Arrays; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.ipc.Server; +import org.apache.hadoop.ipc.VersionedProtocol; + +import junit.framework.TestCase; + +public class TestRPC extends TestCase { + private static final int PORT = 1234; + private static final String ADDRESS = "0.0.0.0"; + + public static final Log LOG = LogFactory + .getLog("org.apache.hadoop.ipc.TestRPC"); + + private static Configuration conf = new Configuration(); + + public TestRPC(String name) { + super(name); + } + + public interface TestProtocol extends VersionedProtocol { + public static final long versionID = 1L; + + void ping() throws IOException; + + String echo(String value) throws IOException; + + String[] echo(String[] value) throws IOException; + + Writable echo(Writable value) throws IOException; + + int add(int v1, int v2) throws IOException; + + int add(int[] values) throws IOException; + + int error() throws IOException; + + void testServerGet() throws IOException; + } + + public class TestImpl implements TestProtocol { + + public long getProtocolVersion(String protocol, long clientVersion) { + return TestProtocol.versionID; + } + + public void ping() { + } + + public String echo(String value) throws IOException { + return value; + } + + public String[] echo(String[] values) throws IOException { + return values; + } + + public Writable echo(Writable writable) { + return writable; + } + + public int add(int v1, int v2) { + return v1 + v2; + } + + public int add(int[] values) { + int sum = 0; + for (int i = 0; i < values.length; i++) { + sum += values[i]; + } + return sum; + } + + public int error() throws IOException { + throw new IOException("bobo"); + } + + public void testServerGet() throws IOException { + if (!(Server.get() instanceof RPC.Server)) { + throw new IOException("Server.get() failed"); + } + } + + } + + public void testCalls() throws Exception { + Server server = RPC.getServer(new TestImpl(), ADDRESS, PORT, conf); + server.start(); + + InetSocketAddress addr = new InetSocketAddress(PORT); + TestProtocol proxy = (TestProtocol) RPC.getProxy(TestProtocol.class, + TestProtocol.versionID, addr, conf); + + proxy.ping(); + + String stringResult = proxy.echo("foo"); + assertEquals(stringResult, "foo"); + + stringResult = proxy.echo((String) null); + assertEquals(stringResult, null); + + String[] stringResults = proxy.echo(new String[] { "foo", "bar" }); + assertTrue(Arrays.equals(stringResults, new String[] { "foo", "bar" })); + + stringResults = proxy.echo((String[]) null); + assertTrue(Arrays.equals(stringResults, null)); + + int intResult = proxy.add(1, 2); + assertEquals(intResult, 3); + + intResult = proxy.add(new int[] { 1, 2 }); + assertEquals(intResult, 3); + + boolean caught = false; + try { + proxy.error(); + } catch (IOException e) { + LOG.debug("Caught " + e); + caught = true; + } + assertTrue(caught); + + proxy.testServerGet(); + + // try some multi-calls + Method echo = TestProtocol.class.getMethod("echo", + new Class[] { String.class }); + String[] strings = (String[]) RPC.call(echo, new String[][] { { "a" }, + { "b" } }, new InetSocketAddress[] { addr, addr }, null, conf); + assertTrue(Arrays.equals(strings, new String[] { "a", "b" })); + + Method ping = TestProtocol.class.getMethod("ping", new Class[] {}); + Object[] voids = (Object[]) RPC.call(ping, new Object[][] { {}, {} }, + new InetSocketAddress[] { addr, addr }, null, conf); + assertEquals(voids, null); + + server.stop(); + } + + public static void main(String[] args) throws Exception { + + new TestRPC("test").testCalls(); + + } + +} Index: src/test/org/apache/hama/util/TestBytes.java =================================================================== --- src/test/org/apache/hama/util/TestBytes.java (리비전 1023616) +++ src/test/org/apache/hama/util/TestBytes.java (작업 사본) @@ -1,3 +1,20 @@ +/** + * 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.hama.util; import java.io.IOException;