[05/50] [abbrv] carbondata git commit: [CARBONDATA-1941] Documentation added for Lock Retry

[ja...@apache.org]

[CARBONDATA-1941] Documentation added for Lock Retry

The properties, default value, and description added for the lock retry

This closes #1780


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/bc305c1e
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/bc305c1e
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/bc305c1e

Branch: refs/heads/carbonstore
Commit: bc305c1e11a6d6e22168f09ee7f879610bcf042c
Parents: 2d9de50
Author: Shahid <sh...@gmail.com>
Authored: Tue Jan 9 19:06:19 2018 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Fri Jan 19 14:50:19 2018 +0800

----------------------------------------------------------------------
 docs/configuration-parameters.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/bc305c1e/docs/configuration-parameters.md
----------------------------------------------------------------------
diff --git a/docs/configuration-parameters.md b/docs/configuration-parameters.md
index 338854f..fc10646 100644
--- a/docs/configuration-parameters.md
+++ b/docs/configuration-parameters.md
@@ -101,10 +101,10 @@ This section provides the details of all the configurations required for CarbonD
 | carbon.csv.read.buffersize.byte | 1048576 | csv reading buffer size. |
 | high.cardinality.value | 100000 | To identify and apply compression for non-high cardinality columns. |
 | carbon.merge.sort.reader.thread | 3 | Maximum no of threads used for reading intermediate files for final merging. |
-| carbon.load.metadata.lock.retries | 3 | Maximum number of retries to get the metadata lock for loading data to table. |
-| carbon.load.metadata.lock.retry.timeout.sec | 5 | Interval between the retries to get the lock. |
 | carbon.concurrent.lock.retries | 100 | Specifies the maximum number of retries to obtain the lock for concurrent operations. This is used for concurrent loading. |
 | carbon.concurrent.lock.retry.timeout.sec | 1 | Specifies the interval between the retries to obtain the lock for concurrent operations. |
+| carbon.lock.retries | 3 | Specifies the maximum number of retries to obtain the lock for any operations other than load. |
+| carbon.lock.retry.timeout.sec | 5 | Specifies the interval between the retries to obtain the lock for any operation other than load. |
 | carbon.tempstore.location | /opt/Carbon/TempStoreLoc | Temporary store location. By default it takes System.getProperty("java.io.tmpdir"). |
 | carbon.load.log.counter | 500000 | Data loading records count logger. |
 | carbon.skip.empty.line | false | Setting this property ignores the empty lines in the CSV file during the data load |