Unverified Commit 600dac75 authored by 蔡宇东's avatar 蔡宇东 Committed by GitHub
Browse files

#1463 update config version to 0.2 (#1466) 



* #1463 update config version to 0.2

Signed-off-by: default avataryudong.cai <yudong.cai@zilliz.com>

* #1463 disable config version check

Signed-off-by: default avataryudong.cai <yudong.cai@zilliz.com>
parent 962a00c3

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1250 Support CPU profiling

-   \#1302 Get all record IDs in a segment by given a segment id

-   \#1461 Add crud APIs and segments APIs into http module

-   \#1463 Update config version to 0.2



## Improvement

-   \#738 Use Openblas / lapack from apt install

core/conf/demo/server_config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express

# or implied. See the License for the specific language governing permissions and limitations under the License.



version: 0.1

version: 0.2



#----------------------+------------------------------------------------------------+------------+-----------------+

# Server Config        | Description                                                | Type       | Default         |

core/conf/server_cpu_config.template

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express

# or implied. See the License for the specific language governing permissions and limitations under the License.



version: 0.1

version: 0.2



#----------------------+------------------------------------------------------------+------------+-----------------+

# Server Config        | Description                                                | Type       | Default         |

core/conf/server_gpu_config.template

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express

# or implied. See the License for the specific language governing permissions and limitations under the License.



version: 0.1

version: 0.2



#----------------------+------------------------------------------------------------+------------+-----------------+

# Server Config        | Description                                                | Type       | Default         |

core/src/server/Config.cpp

+11 −7
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ namespace server { 


constexpr int64_t GB = 1UL << 30;



static const std::unordered_map<std::string, std::string> milvus_config_version_map({{"0.7.0", "0.1"}});

static const std::unordered_map<std::string, std::string> milvus_config_version_map({{"0.6.0", "0.1"},

                                                                                     {"0.7.0", "0.2"}});



/////////////////////////////////////////////////////////////

Config::Config() {
@@ -609,12 +610,15 @@ Config::CancelCallBack(const std::string& node, const std::string& sub_node, con 
////////////////////////////////////////////////////////////////////////////////

Status

Config::CheckConfigVersion(const std::string& value) {

    if (milvus_config_version_map.find(MILVUS_VERSION) != milvus_config_version_map.end()) {

        bool exist_error = milvus_config_version_map.at(MILVUS_VERSION) != value;

        fiu_do_on("check_config_version_fail", exist_error = true);

        if (exist_error) {

            std::string msg = "Invalid config version: " + value +

                              ". Expected config version: " + milvus_config_version_map.at(MILVUS_VERSION);

        return Status(SERVER_INVALID_ARGUMENT, msg);

            SERVER_LOG_ERROR << msg;

            // return Status(SERVER_INVALID_ARGUMENT, msg);

        }

    }

    return Status::OK();

}