Skip to content
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.

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

Feature: S3C-1966: KMIP TLS Transport #688

Merged
merged 1 commit into from
Feb 28, 2019

Conversation

ploki
Copy link
Contributor

@ploki ploki commented Feb 23, 2019

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Feb 23, 2019

Hello ploki,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 23, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Feb 23, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@ploki ploki force-pushed the feature/S3C-1966/kmip-tls-transport branch from 2b1138a to 1189f14 Compare February 23, 2019 00:18
@bert-e
Copy link
Contributor

bert-e commented Feb 23, 2019

History mismatch

Merge commit #2b1138aec8424198f63afb2b69fc7bcf6d0e3670 on the integration branch
w/8.0/feature/S3C-1966/kmip-tls-transport is merging a branch which is neither the current
branch feature/S3C-1966/kmip-tls-transport nor the development branch
development/8.0.

It is likely due to a rebase of the branch feature/S3C-1966/kmip-tls-transport and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@ploki ploki requested a review from tmacro February 26, 2019 23:41
constructor(channel, options) {
this.channel = channel;
this.options = options;
this.pipelineDepth = Math.max(1, options.pipelineDepth ||

Choose a reason for hiding this comment

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

Just want to confirm that the 0 case is intended to go to the default rather than the max of 1. For example:

  • if options.pipelineDepth is < 0 this.pipelineDepth is 1
  • if options.pipelineDepth is equal to 0 this.pipelineDepth is 8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

exact! (actually, 1 is the min)

debug: () => {},
error: () => {},
};
const { logger } = require('../../utils/kmip/ersatz.js');

Choose a reason for hiding this comment

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

I like the file name here ✅

@ploki
Copy link
Contributor Author

ploki commented Feb 27, 2019

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Build failed

The build for commit did not succeed in branch w/8.1/feature/S3C-1966/kmip-tls-transport.

The following options are set: approve

@ploki
Copy link
Contributor Author

ploki commented Feb 27, 2019

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2019

Build failed

The build for commit did not succeed in branch w/8.1/feature/S3C-1966/kmip-tls-transport.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

end() {
if (this.callbackPipeline.length !== 0 ||
this.deferedRequests.length !== 0) {
this.pipelineDrainedCallback = this.socket.end.bind(this.socket);

Choose a reason for hiding this comment

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

Is there any scenario where this.socket could be null here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, after a misusage of the API during shutdown (calling twice, or race reaping the pending errors).
Good catch, need to be checked

Copy link

@bennettbuchanan bennettbuchanan left a comment

Choose a reason for hiding this comment

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

Left one consideration, but LGTM overall! ✅

@ploki ploki force-pushed the feature/S3C-1966/kmip-tls-transport branch from 3b45b3e to b3598c5 Compare February 28, 2019 19:49
@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

History mismatch

Merge commit #1189f14bb0d0bdd60c8c9f7b0fc24b3d1be76d4a on the integration branch
w/8.0/feature/S3C-1966/kmip-tls-transport is merging a branch which is neither the current
branch feature/S3C-1966/kmip-tls-transport nor the development branch
development/8.0.

It is likely due to a rebase of the branch feature/S3C-1966/kmip-tls-transport and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@ploki
Copy link
Contributor Author

ploki commented Feb 28, 2019

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@ploki
Copy link
Contributor Author

ploki commented Feb 28, 2019

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.5

  • ✔️ development/8.0

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 28, 2019

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.5

  • ✔️ development/8.0

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4
  • stabilization/7.4.3

Please check the status of the associated issue S3C-1966.

Goodbye ploki.

@bert-e bert-e merged commit b3598c5 into development/7.5 Feb 28, 2019
@ploki ploki deleted the feature/S3C-1966/kmip-tls-transport branch February 28, 2019 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants