Skip to content

Commit

Permalink
HDDS-3542.Ozone chunkinfo CLI cannot connect to OM when run from non-…
Browse files Browse the repository at this point in the history
…om node. (#993)
  • Loading branch information
sadanand48 committed Jun 3, 2020
1 parent e4f23ee commit b05005e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRoleInfo;
import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
Expand Down Expand Up @@ -629,4 +630,8 @@ List<OzoneFileStatus> listStatus(String volumeName, String bucketName,
* */
List<OzoneAcl> getAcl(OzoneObj obj) throws IOException;

/**
* Getter for OzoneManagerClient.
*/
OzoneManagerProtocol getOzoneManagerClient();
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.hadoop.hdds.scm.cli.ContainerOperationClient;
import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientException;
Expand All @@ -40,9 +39,6 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.om.protocolPB.OmTransport;
import org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory;
import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.keys.KeyHandler;
import org.apache.hadoop.security.UserGroupInformation;
Expand Down Expand Up @@ -84,12 +80,8 @@ protected void execute(OzoneClient client, OzoneAddress address)
ContainerOperationClient(createOzoneConfiguration());
xceiverClientManager = containerOperationClient
.getXceiverClientManager();
OmTransport omTransport = OmTransportFactory
.create(getConf(), UserGroupInformation.getCurrentUser(), null);
ozoneManagerClient = TracingUtil.createProxy(
new OzoneManagerProtocolClientSideTranslatorPB(
omTransport, clientId.toString()),
OzoneManagerProtocol.class, getConf());
ozoneManagerClient = client.getObjectStore().getClientProxy()
.getOzoneManagerClient();
address.ensureKeyAddress();
JsonObject jsonObj = new JsonObject();
JsonElement element;
Expand Down

0 comments on commit b05005e

Please sign in to comment.