This is an automated email from the ASF dual-hosted git repository.

luochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new d203752  [NO ISSUE][DOC] Fix doc of recovery memory budget
d203752 is described below

commit d203752221e8aafdd2abf9c8168e2a420415525f
Author: luochen <[email protected]>
AuthorDate: Wed Oct 30 10:41:18 2019 -0700

    [NO ISSUE][DOC] Fix doc of recovery memory budget
    
    - user model changes: yes
    - storage format changes: no
    - interface changes: no
    
    Details:
    Fix the doc of recovery memory budget to clarify that
    the memory budget is enforced for each job, not globally
    
    Change-Id: I36650591fc6bbf5abae739f9fb1981ba22549be2
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/3983
    Contrib: Jenkins <[email protected]>
    Tested-by: Jenkins <[email protected]>
    Integration-Tests: Jenkins <[email protected]>
    Reviewed-by: Murtadha Hubail <[email protected]>
---
 .../java/org/apache/asterix/common/config/TransactionProperties.java    | 2 +-
 asterixdb/asterix-doc/src/site/markdown/ncservice.md                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
index 5ed069c..0de2c3d 100644
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
@@ -78,7 +78,7 @@ public class TransactionProperties extends AbstractProperties 
{
         TXN_JOB_RECOVERY_MEMORYSIZE(
                 LONG_BYTE_UNIT,
                 StorageUtil.getLongSizeInBytes(64L, MEGABYTE),
-                "The memory budget (in bytes) used for recovery");
+                "The memory budget for each job (in bytes) used for recovery");
 
         private final IOptionType type;
         private final Object defaultValue;
diff --git a/asterixdb/asterix-doc/src/site/markdown/ncservice.md 
b/asterixdb/asterix-doc/src/site/markdown/ncservice.md
index 8d1a8cd..c996e23 100644
--- a/asterixdb/asterix-doc/src/site/markdown/ncservice.md
+++ b/asterixdb/asterix-doc/src/site/markdown/ncservice.md
@@ -365,7 +365,7 @@ The following parameters are configured under the 
"[common]" section.
 | common  | storage.max.active.writable.datasets      | The maximum number of 
datasets that can be concurrently modified | 8 |
 | common  | txn.commitprofiler.enabled                | Enable output of 
commit profiler logs | false |
 | common  | txn.commitprofiler.reportinterval         | Interval (in seconds) 
to report commit profiler logs | 5 |
-| common  | txn.job.recovery.memorysize               | The memory budget (in 
bytes) used for recovery | 67108864 (64 MB) |
+| common  | txn.job.recovery.memorysize               | The memory budget for 
each job job (in bytes) used for recovery | 67108864 (64 MB) |
 | common  | txn.lock.escalationthreshold              | The maximum number of 
entity locks to obtain before upgrading to a dataset lock | 1000 |
 | common  | txn.lock.shrinktimer                      | The time (in 
milliseconds) where under utilization of resources will trigger a shrink phase 
| 5000 |
 | common  | txn.lock.timeout.sweepthreshold           | Interval (in 
milliseconds) for checking lock timeout | 10000 |

Reply via email to