Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Commit

Permalink
Handle review comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
govint committed Mar 14, 2017
1 parent ca0d151 commit dc1a808
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
6 changes: 1 addition & 5 deletions esx_service/vmci/vmci_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ typedef struct be_request {
typedef struct be_answer {
char *buf; // response buffer
char errBuf[ERR_BUF_LEN]; // error response buffer
char *errBufP; // error response pointer
} be_answer;

//
Expand Down Expand Up @@ -357,18 +356,15 @@ Vmci_GetReply(int port, const char* json_request, const char* be_name,

req.mlen = strnlen(json_request, MAXBUF) + 1;
req.msg = json_request;
ans->errBufP = ans->errBuf;

return host_request(be, &req, ans, ESX_VMCI_CID, port);
}

void
Vmci_FreeBuf(be_answer *ans)
{
if (ans) {
if (ans->buf) {
if (ans && ans->buf) {
free(ans->buf);
ans->buf = NULL;
}
}
}
1 change: 0 additions & 1 deletion vmdk_plugin/E2E_Tests/createVolume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func TestVolumeCreationFirstTime(t *testing.T) {
out, err = TestUtil.CreateDefaultVolume(host, volumeName)

if err != nil {
//t.Errorf("\nError has occurred [%s] \n\twhile creating volume [%s] very first time: err -> %v", out, volumeName, err)
t.Errorf("\nError has occurred [%s] \n\twhile creating volume [%s] very first time: err -> %v", out, volumeName, err)
} else {
t.Logf("\nTestcase passed: successfully able to create volume [%s]\n", out)
Expand Down
12 changes: 2 additions & 10 deletions vmdk_plugin/drivers/vmdk/vmdkops/esx_vmdkcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,7 @@ func (vmdkCmd EsxVmdkCmd) Run(cmd string, name string, opts map[string]string) (
if err != nil {
var errno syscall.Errno
errno = err.(syscall.Errno)
msg = fmt.Sprintf("Run '%s' failed: %v (errno=%d).", cmd, err, int(errno))
str := C.GoString(ans.errBufP)
if str != "" {
msg += str
}
msg = fmt.Sprintf("Run '%s' failed: %v (errno=%d) - %s", cmd, err, int(errno), C.GoString(&ans.errBuf[0]))
if i < maxRetryCount {
log.Warnf(msg + " Retrying...")
time.Sleep(time.Second * 1)
Expand All @@ -124,11 +120,7 @@ func (vmdkCmd EsxVmdkCmd) Run(cmd string, name string, opts map[string]string) (
msg += " Cannot communicate with ESX, please refer to the FAQ https://github.com/vmware/docker-volume-vsphere/wiki#faq"
}
} else {
msg = "Internal issue: ret != 0 but errno is not set. Cancelling operation. "
str := C.GoString(ans.errBufP)
if str != "" {
msg += str
}
msg = fmt.Sprintf("Internal issue: ret != 0 but errno is not set. Cancelling operation - %s ", C.GoString(&ans.errBuf[0]))
}

log.Warnf(msg)
Expand Down

0 comments on commit dc1a808

Please sign in to comment.