Skip to content

RPC container content fix #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcrankshaw merged 2 commits into from
Jun 27, 2017
Merged

RPC container content fix #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc0bde
Fix RPC edge case
Corey-Zumar Jun 27, 2017
028fb59
Format code
Corey-Zumar Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions containers/python/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def run(self):

t4 = datetime.now()

response.send(socket)
response.send(socket, self.event_history)

print("recv: %f us, parse: %f us, handle: %f us" %
((t2 - t1).microseconds, (t3 - t2).microseconds,
Expand All @@ -313,7 +313,7 @@ def run(self):
else:
feedback_request = FeedbackRequest(msg_id_bytes, [])
response = self.handle_feedback_request(received_msg)
response.send(socket)
response.send(socket, self.event_history)
print("recv: %f us" % ((t2 - t1).microseconds))

sys.stdout.flush()
Expand Down Expand Up @@ -394,13 +394,14 @@ def add_output(self, output):
self.string_content_end_position + output_len] = output
self.string_content_end_position += output_len

def send(self, socket):
def send(self, socket, event_history):
socket.send("", flags=zmq.SNDMORE)
socket.send(
struct.pack("<I", MESSAGE_TYPE_CONTAINER_CONTENT),
flags=zmq.SNDMORE)
socket.send(self.msg_id, flags=zmq.SNDMORE)
socket.send(self.output_buffer[0:self.string_content_end_position])
event_history.insert(EVENT_HISTORY_SENT_CONTAINER_CONTENT)
Copy link
Contributor Author

@Corey-Zumar Corey-Zumar Jun 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This missing event history log did not contribute to #231 , but I've corrected the logging issue while addressing the bug.


def expand_buffer_if_necessary(self, size):
if len(self.output_buffer) < size:
Expand Down
14 changes: 7 additions & 7 deletions src/libclipper/src/rpc_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ void RPCService::receive_message(
zmq_connection_id += 1;
}
} break;
case MessageType::ContainerContent:
case MessageType::ContainerContent: {
// This message is a response to a container query
message_t msg_id;
message_t msg_content;
socket.recv(&msg_id, 0);
socket.recv(&msg_content, 0);
if (!new_connection) {
// This message is a response to a container query
message_t msg_id;
message_t msg_content;
socket.recv(&msg_id, 0);
socket.recv(&msg_content, 0);
int id = static_cast<int *>(msg_id.data())[0];
vector<uint8_t> content(
(uint8_t *)msg_content.data(),
Expand All @@ -303,7 +303,7 @@ void RPCService::receive_message(

response_queue_->push(response);
}
break;
} break;
case MessageType::Heartbeat:
send_heartbeat_response(socket, connection_id, new_connection);
break;
Expand Down