You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by eo...@apache.org on 2021/12/15 16:19:06 UTC
[pulsar] branch branch-2.9 updated (af5ce3f -> 7d1bc57)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git.
discard af5ce3f Fixing permissions of scripts used to deploy docker images (#11951)
discard 6366405 [ML] Add OpAddEntry to pendingAddEntries after the state check (#12570)
discard 393f95c [Transaction] Fix transaction system topic create in loop. (#12749)
new bce5d56 [ML] Add OpAddEntry to pendingAddEntries after the state check (#12570)
new 7d1bc57 Fixing permissions of scripts used to deploy docker images (#11951)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (af5ce3f)
\
N -- N -- N refs/heads/branch-2.9 (7d1bc57)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pulsar/broker/transaction/TransactionTest.java | 57 ----------------------
1 file changed, 57 deletions(-)
[pulsar] 01/02: [ML] Add OpAddEntry to pendingAddEntries after the state check (#12570)
Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit bce5d56e5f7250d3337838c69cb9a0d0051a65e2
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Tue Nov 2 06:00:33 2021 +0200
[ML] Add OpAddEntry to pendingAddEntries after the state check (#12570)
- when the state was Fenced, Terminated or Closed, the OpAddEntry
instance would remain in pendingAddEntries although the operation is failed
immediately.
(cherry picked from commit 409239ce27d7d5f9800c5d09e0455ad4c5c0871c)
---
.../java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index fa9a5cf..957cfbb 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -729,7 +729,6 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
if (!beforeAddEntry(addOperation)) {
return;
}
- pendingAddEntries.add(addOperation);
final State state = STATE_UPDATER.get(this);
if (state == State.Fenced) {
addOperation.failed(new ManagedLedgerFencedException());
@@ -741,10 +740,10 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
addOperation.failed(new ManagedLedgerAlreadyClosedException("Managed ledger was already closed"));
return;
} else if (state == State.WriteFailed) {
- pendingAddEntries.remove(addOperation);
addOperation.failed(new ManagedLedgerAlreadyClosedException("Waiting to recover from failure"));
return;
}
+ pendingAddEntries.add(addOperation);
if (state == State.ClosingLedger || state == State.CreatingLedger) {
// We don't have a ready ledger to write into
[pulsar] 02/02: Fixing permissions of scripts used to deploy docker images (#11951)
Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 7d1bc574fe785f7237c313feb5b31b5b84aa5127
Author: Massimiliano Mirelli <ma...@gmail.com>
AuthorDate: Fri Dec 3 16:48:00 2021 +0200
Fixing permissions of scripts used to deploy docker images (#11951)
(cherry picked from commit caa068fb0b461a806bda8aa9b88dced47a00d158)
---
src/assembly-source-package.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/assembly-source-package.xml b/src/assembly-source-package.xml
index 2677299..f31aadc 100644
--- a/src/assembly-source-package.xml
+++ b/src/assembly-source-package.xml
@@ -106,6 +106,7 @@
<outputDirectory>/docker/pulsar/scripts</outputDirectory>
<includes>
<include>*.sh</include>
+ <include>*.py</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>