Skip to content

Commit

Permalink
Merge remote-tracking branch 'couchbase/unstable' into HEAD
Browse files Browse the repository at this point in the history 
http://ci-eventing-rebalance.northscale.in/eventing-09.05.2019-23.17.pass.html

Change-Id: Ie20de2e6cb04a4d29ae73c75f742d9ed29845f5a
  • Loading branch information
@jeelanp2003
jeelanp2003 committed May 10, 2019
2 parents d8aaebe + 5880d36 commit 1a48255
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 75 deletions.
7 changes: 6 additions & 1 deletion supervisor/exported_functions.go
View file
Expand Up @@ -293,7 +293,12 @@ func (s *SuperSupervisor) RebalanceTaskProgress(appName string) (*common.Rebalan
}

progress := &common.RebalanceProgress{}
progress.VbsRemainingToShuffle = 1

// report rebalance progress for yet-to-bootstrap-apps only if node is still part of cluster
if s.checkIfNodeInCluster() {
progress.VbsRemainingToShuffle = 1
}

return progress, nil
}

Expand Down
144 changes: 72 additions & 72 deletions ui/eventing-ui/ui-current/fragments/app-settings.html
View file
Expand Up @@ -205,7 +205,7 @@ <h4>Bindings</h4>
<hr>
<!-- binding TYPE -->
<div ng-repeat="binding in (formCtrl.isDialog ? bindings : formCtrl.bindings) track by $index">
<div class="row flex-left flex-wrap margin-bottom-half margin-right-1">
<div class="row flex-left flex-wrap margin-bottom-1 margin-right-1">
<span class="fix-width-2 padding-right-half margin-bottom-half">
<select
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type"
Expand All @@ -219,11 +219,11 @@ <h4>Bindings</h4>
<span
class="padding-right-half flex-grow-1 margin-bottom-half"
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'alias'">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].value"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="alias name...">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].value"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="alias name...">
</span>
<span
class="fix-width-2 padding-right-half margin-bottom-half"
Expand All @@ -248,43 +248,43 @@ <h4>Bindings</h4>
<span
class="padding-right-half flex-grow-1 margin-bottom-half"
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url'">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].value"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="alias name...">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].value"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="alias name...">
</span>
<span
class="padding-right-half flex-grow-1 margin-bottom-half"
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url'">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].hostname"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="URL...">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].hostname"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="URL...">
</span>
<span
class="fix-width-2 padding-right-half margin-bottom-half"
class="padding-right-half margin-bottom-half width-12"
ng-show="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url'">
<input
type="checkbox"
id="{{'allow-cookies-' + $index }}"
name="allow_cookies"
value="allow"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].allow_cookies"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
<label for="{{'allow-cookies-' + $index }}" ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
allow cookies
</label>
<input
type="checkbox"
id="{{'validate-ssl-certificate-' + $index}}"
name="validate_ssl_certificate"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].validate_ssl_certificate"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
<label for="{{'validate-ssl-certificate-' + $index}}" ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
validate SSL certificate
</label>
<input
type="checkbox"
id="{{'allow-cookies-' + $index }}"
name="allow_cookies"
value="allow"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].allow_cookies"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
<label for="{{'allow-cookies-' + $index }}" ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
allow cookies
</label>
<input
type="checkbox"
id="{{'validate-ssl-certificate-' + $index}}"
name="validate_ssl_certificate"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].validate_ssl_certificate"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
<label for="{{'validate-ssl-certificate-' + $index}}" ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)">
validate SSL certificate
</label>
</span>
<span
class="fix-width-1-5 padding-right-half margin-bottom-half"
Expand All @@ -300,54 +300,54 @@ <h4>Bindings</h4>
</span>
<!-- AUTH extra fields -->
<span
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'basic'"
ng-if="((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'basic') && ((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url')"
class="padding-right-half flex-grow-1 margin-bottom-half">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].username"
id="auth-basic-username"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="username...">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].username"
id="auth-basic-username"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="username...">
</span>
<span
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'basic'"
ng-if="((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'basic') && ((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url')"
class="padding-right-half flex-grow-1 margin-bottom-half">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].password"
id="auth-basic-password"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="password...">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].password"
id="auth-basic-password"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="password...">
</span>
<span
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'digest'"
ng-if="((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'digest') && ((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url')"
class="padding-right-half flex-grow-1 margin-bottom-half">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].username"
id="auth-digest-username"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="username...">
<input
type="text"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].username"
id="auth-digest-username"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="username...">
</span>
<span
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'digest'"
ng-if="((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'digest') && ((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url')"
class="padding-right-half flex-grow-1 margin-bottom-half">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].password"
id="auth-digest-password"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="password...">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].password"
id="auth-digest-password"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="password...">
</span>
<span
ng-if="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'bearer'"
ng-if="((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].auth_type === 'bearer') && ((formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].type === 'url')"
class="padding-right-half flex-grow-1 margin-bottom-half">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].bearer_key"
id="auth-bearer"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="bearer key...">
<input
type="password"
ng-model="(formCtrl.isDialog ? bindings : formCtrl.bindings)[$index].bearer_key"
id="auth-bearer"
ng-disabled="(formCtrl.isAppDeployed && !formCtrl.isAppPaused)"
placeholder="bearer key...">
</span>
<div
class="red-2 cursor-pointer"
Expand Down Expand Up @@ -393,4 +393,4 @@ <h4>Bindings</h4>
</button>
</div>
</form>
</div>
</div>
4 changes: 2 additions & 2 deletions v8_consumer/src/client.cc
View file
Expand Up @@ -832,7 +832,7 @@ void AppWorker::WriteResponses() {
WriteResponseWithRetry(feedback_conn_handle_, messages, batch_size);
timer_responses_sent += messages.size() / 2;
for (auto &buf : messages) {
delete buf.base;
delete[] buf.base;
}
}

Expand All @@ -858,7 +858,7 @@ void AppWorker::WriteResponses() {

WriteResponseWithRetry(feedback_conn_handle_, messages, batch_size);
for (auto &buf : messages) {
delete buf.base;
delete[] buf.base;
}
}

Expand Down

0 comments on commit 1a48255

Please sign in to comment.