Fix the issue that client without protocol version set cannot talk to server with protocol version check. #1106

lipingxue · 2017-03-28T22:25:50Z

This PR is to make sure client without protocol version set can talk to server with protocol check
to make sure the backward compatibility.
Fixed #1102.

… server with protocol version check.

shaominchen · 2017-03-28T22:31:54Z

esx_service/vmdk_ops.py

@@ -1491,8 +1491,8 @@ def execRequestThread(client_socket, cartel, request):
            send_vmci_reply(client_socket, reply_string)
        else:
            logging.debug("execRequestThread: req=%s", req)
-            # If req from client does not include version number, set the version to "1" by default
-            client_protocol_version = int(req["version"]) if "version" in req else 1
+            # If req from client does not include version number, set the version to "2" by default


"2" seems a magic number here. Shouldn't we just use the constant "SERVER_PROTOCOL_VERSION"?

lipingxue · 2017-03-28T22:41:57Z

I have test the following two configuration manually with basic create/attach/detach/rm flow.

Docker version in Ubuntu VM:
root@sc-rdops-vm18-dhcp-57-89:~# docker -v
Docker version 17.03.0-ce, build 3a232c8

Config1: ESX with latest build (0.12.938dc3e-0.0.1, with protocol version check), VM install 0.12 build (0.12.dadf7db, without protocol version set)

step1: create volume

root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME

root@sc-rdops-vm18-dhcp-57-89:~# docker volume create --driver=vsphere --name=testvol1
testvol1
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME
vsphere             testvol1@datastore2

step2: run a busybox container to attach the volume

root@sc-rdops-vm18-dhcp-57-89:~# docker run --rm -it -v testvol1:/data busybox
Unable to find image 'busybox:latest' locally
latest: Pulling from library/busybox
7520415ce762: Pull complete
Digest: sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f
Status: Downloaded newer image for busybox:latest
/ # pwd
/
/ # ls
bin   data  dev   etc   home  proc  root  sys   tmp   usr   var
/ # root@sc-rdops-vm18-dhcp-57-89:~#

step3: remove the container to detach the volume

root@sc-rdops-vm18-dhcp-57-89:~# docker rm d5b4b21c6f45 -f
d5b4b21c6f45

step4: remove volume

root@sc-rdops-vm18-dhcp-57-89:~# docker volume rm testvol1@datastore2
testvol1@datastore2
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME

Config2: ESX with 0.12 build (0.12.3f64805-0.0.1, no protocol version check), VM with latest build (0.12.938dc3e, with protocol version set)

step1: create volume

root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~# docker volume create --driver=vsphere --name=testvol2
testvol2
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME
vsphere             testvol2@datastore2

step2: run a busybox container to attach the volume

root@sc-rdops-vm18-dhcp-57-89:~# docker run --rm -it -v testvol2:/data busybox
/ # ls
bin   data  dev   etc   home  proc  root  sys   tmp   usr   var
/ # root@sc-rdops-vm18-dhcp-57-89:~#

step3: remove the container to detach the volume

root@sc-rdops-vm18-dhcp-57-89:~# docker rm e9dc38890c9f  -f
e9dc38890c9f

step4: remove volume

root@sc-rdops-vm18-dhcp-57-89:~# docker volume rm testvol2
testvol2
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~#
root@sc-rdops-vm18-dhcp-57-89:~# docker volume ls
DRIVER              VOLUME NAME

shuklanirdesh82

LGTM!

shuklanirdesh82 · 2017-03-28T23:00:02Z

@lipingxue can you please link the issue this PR is fixing?

shaominchen

LGTM.

pdhamdhere · 2017-03-29T03:02:38Z

esx_service/vmdk_ops.py

-            client_protocol_version = int(req["version"]) if "version" in req else 1
+            # If req from client does not include version number, set the version to
+            # SERVER_PROTOCOL_VERSION by default to make backward compatible
+            client_protocol_version = int(req["version"]) if "version" in req else SERVER_PROTOCOL_VERSION


I see. Looks like original implementation did consider backward compatibility but hardcoded version, 1, broke it!

Fix the issue that client without protocol version set cannot talk to…

b48971c

… server with protocol version check.

vmwclabot added the cla-not-required label Mar 28, 2017

shaominchen reviewed Mar 28, 2017

View reviewed changes

Address comments from Sam.

d023bea

shuklanirdesh82 approved these changes Mar 28, 2017

View reviewed changes

shaominchen approved these changes Mar 28, 2017

View reviewed changes

pdhamdhere approved these changes Mar 29, 2017

View reviewed changes

Minor change in comments and repush to trigger CI!

e4b7775

pdhamdhere force-pushed the test_upgrade_version_change.liping branch from 1dcdfa1 to e4b7775 Compare March 29, 2017 03:14

pdhamdhere merged commit 5f6d430 into master Mar 29, 2017

shuklanirdesh82 deleted the test_upgrade_version_change.liping branch March 31, 2017 07:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the issue that client without protocol version set cannot talk to server with protocol version check. #1106

Fix the issue that client without protocol version set cannot talk to server with protocol version check. #1106

lipingxue commented Mar 28, 2017 •

edited

Loading

shaominchen Mar 28, 2017

lipingxue Mar 28, 2017

lipingxue commented Mar 28, 2017

shuklanirdesh82 left a comment

shuklanirdesh82 commented Mar 28, 2017

shaominchen left a comment

pdhamdhere Mar 29, 2017

Fix the issue that client without protocol version set cannot talk to server with protocol version check. #1106

Fix the issue that client without protocol version set cannot talk to server with protocol version check. #1106

Conversation

lipingxue commented Mar 28, 2017 • edited Loading

shaominchen Mar 28, 2017

Choose a reason for hiding this comment

lipingxue Mar 28, 2017

Choose a reason for hiding this comment

lipingxue commented Mar 28, 2017

shuklanirdesh82 left a comment

Choose a reason for hiding this comment

shuklanirdesh82 commented Mar 28, 2017

shaominchen left a comment

Choose a reason for hiding this comment

pdhamdhere Mar 29, 2017

Choose a reason for hiding this comment

lipingxue commented Mar 28, 2017 •

edited

Loading