changeset 331:8266d7cfba7e

add comment
author sugi
date Thu, 03 Apr 2014 20:26:23 +0900
parents d35ff0f588e8
children 6b82dae5d537
files src/alice/topology/manager/keeparive/RemoveTask.java src/alice/topology/manager/keeparive/RespondPing.java src/alice/topology/manager/keeparive/TaskExecuter.java
diffstat 3 files changed, 5 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/alice/topology/manager/keeparive/RemoveTask.java	Mon Mar 31 22:28:52 2014 +0900
+++ b/src/alice/topology/manager/keeparive/RemoveTask.java	Thu Apr 03 20:26:23 2014 +0900
@@ -15,21 +15,18 @@
 
 	@Override
 	public void run() {
-		System.out.println("cccc");
 		ListManager list = info1.asClass(ListManager.class); // explicit cast
 		TaskInfo task = info2.asClass(TaskInfo.class);
 		TaskExecuter exec = TaskExecuter.getInstance();
 		if (exec.compareNowTask(task)){
 			// case: remove task is state countdown.
-			System.out.println("delete task");
 			exec.skip();
 		} else {
 			boolean removeFlag = false;
 			// case: remove task is still in the waiting queue.
 			for (TaskInfo t: list.getTaskList()){
 				if (t.getType().equals(task.getType())){
-					list.getTaskList().remove(t);
-					System.out.println("delete task");
+					list.getTaskList().remove(t); // this operation should be executed by list Manager.
 					removeFlag = true;
 					break;
 				}
--- a/src/alice/topology/manager/keeparive/RespondPing.java	Mon Mar 31 22:28:52 2014 +0900
+++ b/src/alice/topology/manager/keeparive/RespondPing.java	Thu Apr 03 20:26:23 2014 +0900
@@ -30,15 +30,14 @@
 			if (exec.compareNowTask(task)){
 				// case: remove task is state countdown.
 				exec.skip(); // countdown
-				System.out.println("delete task");
 			} else {
 				// case: remove task is still in the waiting queue.
 				ods.put("_REMOVETASK",task);
 				new RemoveTask();
 			}
-			//TaskInfo task2 = new TaskInfo(TaskType.PING);
-			//task2.setInfo(d.from, "_FORM_"+d.from, 5 * 1000);
-			//ods.put("_TASKINFO", task2);
+			TaskInfo task2 = new TaskInfo(TaskType.PING);
+			task2.setInfo(d.from, "_FORM_"+d.from, 5 * 1000);
+			ods.put("_TASKINFO", task2);
 		}
 	}
 }
--- a/src/alice/topology/manager/keeparive/TaskExecuter.java	Mon Mar 31 22:28:52 2014 +0900
+++ b/src/alice/topology/manager/keeparive/TaskExecuter.java	Thu Apr 03 20:26:23 2014 +0900
@@ -66,9 +66,7 @@
 
 	private synchronized void execTask(){
 		// ping or close
-		System.out.println("aaaa");
 		if (nowTask.getType() == TaskType.PING) {
-			System.out.println("bbb");
 			ods.ping(nowTask.getManagerKey(), nowTask.getReturnKey());
 			TaskInfo task = new TaskInfo(TaskType.CLOSE);
 			task.setInfo(nowTask.getManagerKey(), 10 * 1000);
@@ -76,11 +74,7 @@
 			new RespondPing(nowTask.getReturnKey());
 		} else if (nowTask.getType() == TaskType.CLOSE) {
 			// no response from the Remote DataSegment. So close this connection.
-			//DataSegment.get(nowTask.getManagerKey()).close();
-			System.out.println("CLOSE");
-			
-			nowTask.show();
-			System.exit(0);
+			DataSegment.get(nowTask.getManagerKey()).close();
 		}
 	}