Merge branch 'branch-0.3.0' into 'branch-0.3.0'

change default db path

See merge request megasearch/vecwise_engine!128

Former-commit-id: fce70661ae77c731987e85513be2504d92719318

cpp/.gitignore

 milvus/
 conf/server_config.yaml
+conf/log_config.conf
 version.h
 megasearch/

cpp/CHANGELOG.md

@@ -24,6 +24,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-122 - Archive criteria config 
 - MS-124 - HasTable interface
 - MS-126 - Add more error code
+- MS-128 - Change default db path
 
 ## New Feature
 

cpp/CMakeLists.txt

@@ -135,12 +135,19 @@ if (BUILD_COVERAGE STREQUAL "ON")
 endif()
 
 
-if (BUILD_UNIT_TEST)
+if ("${BUILD_UNIT_TEST}" STREQUAL "ON")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unittest)
 endif(BUILD_UNIT_TEST)
 
 add_custom_target(Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean)
 
+
+if("${MILVUS_DB_PATH}" STREQUAL "")
+    set(MILVUS_DB_PATH "/tmp/milvus")
+endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.conf)
+
 #install
 install(FILES
         scripts/start_server.sh
@@ -153,4 +160,6 @@ install(FILES
         DESTINATION
         conf)
 
+
+
 config_summary()

cpp/build.sh

 #!/bin/bash
 
 BUILD_TYPE="Debug"
-BUILD_UNITTEST="off"
+BUILD_UNITTEST="OFF"
 LICENSE_CHECK="OFF"
 INSTALL_PREFIX=$(pwd)/milvus
 MAKE_CLEAN="OFF"
 BUILD_COVERAGE="OFF"
+DB_PATH="/opt/milvus"
 
-while getopts "p:t:uhlrc" arg
+while getopts "p:d:t:uhlrc" arg
 do
         case $arg in
              t)
@@ -15,11 +16,14 @@ do
                 ;;
              u)
                 echo "Build and run unittest cases" ;
-                BUILD_UNITTEST="on";
+                BUILD_UNITTEST="ON";
                 ;;
              p)
                 INSTALL_PREFIX=$OPTARG
                 ;;
+             d)
+                DB_PATH=$OPTARG
+                ;;
              l)
                 LICENSE_CHECK="ON"
                 ;;
@@ -36,12 +40,13 @@ do
                 echo "
 
 parameter:
--t: build type
--u: building unit test options
--p: install prefix
--l: build license version
--r: remove previous build directory
--c: code coverage
+-t: build type(default: Debug)
+-u: building unit test options(default: OFF)
+-p: install prefix(default: $(pwd)/milvus)
+-d: db path(default: /opt/milvus)
+-l: build license version(default: OFF)
+-r: remove previous build directory(default: OFF)
+-c: code coverage(default: OFF)
 
 usage:
 ./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c]
@@ -71,6 +76,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
     -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \
     -DCMAKE_LICENSE_CHECK=${LICENSE_CHECK} \
     -DBUILD_COVERAGE=${BUILD_COVERAGE} \
+    -DMILVUS_DB_PATH=${DB_PATH} \
     $@ ../"
     echo ${CMAKE_CMD}
 

cpp/conf/log_config.conf

@@ -20,8 +20,8 @@
     TO_STANDARD_OUTPUT      =   false
 ## Error logs
 * ERROR:
-    ENABLED                 =   false
+    ENABLED                 =   true
     FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%H:%m}-error.log"
 * FATAL:
-    ENABLED                 =   false
-    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%H:%m}-fatal.log"
\ No newline at end of file
+    ENABLED                 =   true
+    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%H:%m}-fatal.log"

cpp/conf/log_config.template

+* GLOBAL:
+    FORMAT                  =   "%datetime | %level | %logger | %msg"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-global.log"
+    ENABLED                 =   true
+    TO_FILE                 =   true
+    TO_STANDARD_OUTPUT      =   false
+    SUBSECOND_PRECISION     =   3
+    PERFORMANCE_TRACKING    =   false
+    MAX_LOG_FILE_SIZE       =   2097152 ## Throw log files away after 2MB
+* DEBUG:
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-debug.log"
+    ENABLED                 =   true
+* WARNING:
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-warning.log"
+* TRACE:
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-trace.log"
+* VERBOSE:
+    FORMAT                  =   "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
+    TO_FILE                 =   false
+    TO_STANDARD_OUTPUT      =   false
+## Error logs
+* ERROR:
+    ENABLED                 =   true
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-error.log"
+* FATAL:
+    ENABLED                 =   true
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-fatal.log"
\ No newline at end of file

cpp/conf/server_config.template

+server_config:
+  address: 0.0.0.0
+  port: 19530                 # the port milvus listen to, default: 19530, range: 1025 ~ 65534
+  gpu_index: 0                # the gpu milvus use, default: 0, range: 0 ~ gpu number - 1
+  mode: single                # milvus deployment type: single, cluster
+
+db_config:
+  db_path: @MILVUS_DB_PATH@             # milvus data storage path
+  db_backend_url: http://127.0.0.1 # meta database uri
+  index_building_threshold: 1024   # index building trigger threshold, default: 1024, unit: MB
+  archive_disk_threshold: 512      # triger archive action if storage size exceed this value, unit: GB
+  archive_days_threshold: 30       # files older than x days will be archived, unit: day
+
+metric_config:
+  is_startup: off      # if monitoring start: on, off
+  collector: prometheus # metrics collector: prometheus
+  prometheus_config:    # following are prometheus configure
+    collect_type: pull  # prometheus collect data method
+    port: 8080          # the port prometheus use to fetch metrics
+    push_gateway_ip_address: 127.0.0.1 # push method configure: push gateway ip address
+    push_gateway_port: 9091            # push method configure: push gateway port
+
+
+license_config:         # license configure
+  license_path: "@MILVUS_DB_PATH@/system.license" # license file path
+
+cache_config:           # cache configure
+  cpu_cache_capacity: 16   # how many memory are used as cache, unit: GB, range: 0 ~ less than total memory
\ No newline at end of file

cpp/conf/server_config.yaml

@@ -22,7 +22,7 @@ metric_config:
 
 
 license_config:         # license configure
-  license_path: "/tmp/system.license" # license file path
+  license_path: "/tmp/milvus/system.license" # license file path
 
 cache_config:           # cache configure
-  cpu_cache_capacity: 16   # how many memory are used as cache, unit: GB, range: 0 ~ less than total memory
\ No newline at end of file
+  cpu_cache_capacity: 16   # how many memory are used as cache, unit: GB, range: 0 ~ less than total memory