Skip to content

Commit

Permalink
Fix #1615, Fix bug in RPC API getActionInfo
Browse files Browse the repository at this point in the history
  • Loading branch information
littlezhou committed Mar 5, 2018
1 parent fa7029f commit db8f93f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public static ActionInfo convert(ActionInfoProto infoProto) {
.setCreateTime(infoProto.getCreateTime())
.setFinished(infoProto.getFinished())
.setFinishTime(infoProto.getFinishTime())
.setProgress(infoProto.getProgress())
.setActionId(infoProto.getActionId())
.setCmdletId(infoProto.getCmdletId());
List<String> list = infoProto.getArgsList();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/**
* 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.smartdata.server.engine.cmdlet;

import org.junit.Assert;
import org.junit.Test;
import org.smartdata.admin.SmartAdmin;
import org.smartdata.model.ActionInfo;
import org.smartdata.model.CmdletInfo;
import org.smartdata.server.MiniSmartClusterHarness;

public class TestActionRpc extends MiniSmartClusterHarness {

@Test
public void testActionProgress() throws Exception {
waitTillSSMExitSafeMode();

SmartAdmin admin = new SmartAdmin(smartContext.getConf());
long cmdId = admin.submitCmdlet("sleep -ms 6000");
try {
CmdletInfo cinfo = admin.getCmdletInfo(cmdId);
long actId = cinfo.getAids().get(0);

ActionInfo actionInfo;
while (true) {
actionInfo = admin.getActionInfo(actId);
if (actionInfo.isFinished()) {
Assert.fail("No intermediate progress observed.");
}
if (actionInfo.getProgress() > 0 && actionInfo.getProgress() < 1.0) {
return;
}
Thread.sleep(500);
}
} finally {
admin.close();
}
}
}

0 comments on commit db8f93f

Please sign in to comment.