Skip to content

Commit

Permalink
Fix crash when hitting the perflog command rule (#1481)
Browse files Browse the repository at this point in the history
The root cause is that we didn't allow the entry when creating
the unique ptr. So it will be a null pointer when the command
was hitting the perflog rule.
  • Loading branch information
git-hulk authored Jun 1, 2023
1 parent 4218a2b commit 58b9927
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/server/redis_connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void Connection::RecordProfilingSampleIfNeed(const std::string &cmd, uint64_t du
rocksdb::SetPerfLevel(rocksdb::PerfLevel::kDisable);
if (perf_context.empty()) return; // request without db operation

auto entry = std::unique_ptr<PerfEntry>();
auto entry = std::make_unique<PerfEntry>();
entry->cmd_name = cmd;
entry->duration = duration;
entry->iostats_context = std::move(iostats_context);
Expand Down
48 changes: 48 additions & 0 deletions tests/gocase/unit/perflog/perflog_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License 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.
*/

package ping

import (
"context"
"fmt"
"testing"

"github.com/apache/incubator-kvrocks/tests/gocase/util"
"github.com/stretchr/testify/require"
)

func TestPerflog(t *testing.T) {
srv := util.StartServer(t, map[string]string{})
defer srv.Close()

ctx := context.Background()
t.Run("PerfLog", func(t *testing.T) {
c := srv.NewClient()
defer func() { require.NoError(t, c.Close()) }()
require.NoError(t, c.ConfigSet(ctx, "profiling-sample-commands", "set").Err())
require.NoError(t, c.ConfigSet(ctx, "profiling-sample-ratio", "100").Err())
require.NoError(t, c.ConfigSet(ctx, "profiling-sample-record-threshold-ms", "0").Err())

for i := 0; i < 10; i++ {
require.NoError(t, c.Set(ctx, fmt.Sprintf("key-%d", i), "value", 0).Err())
}
require.EqualValues(t, 10, c.Do(ctx, "perflog", "len").Val())
})
}

0 comments on commit 58b9927

Please sign in to comment.