You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2017/09/22 22:47:16 UTC

[1/2] kudu git commit: Fix changes that were left out of KUDU-501 and /table template patches

Repository: kudu
Updated Branches:
  refs/heads/master 9c5d6d4df -> 9c1997ad3


Fix changes that were left out of KUDU-501 and /table template patches

Not sure how I did this, but a typo in a comment and some missing
substitute args were fixed but then somehow got left out of the final
changelist.

Change-Id: I97a17f60f23a2ba62f0fa219353b264daeaf7f48
Reviewed-on: http://gerrit.cloudera.org:8080/8125
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins


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

Branch: refs/heads/master
Commit: 06a19bd25a964664db08ef89ab0ebe26369519ab
Parents: 9c5d6d4
Author: Will Berkeley <wd...@apache.org>
Authored: Fri Sep 22 10:09:30 2017 -0700
Committer: Will Berkeley <wd...@gmail.com>
Committed: Fri Sep 22 22:22:29 2017 +0000

----------------------------------------------------------------------
 src/kudu/master/master-path-handlers.cc | 4 ++--
 src/kudu/master/master-path-handlers.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/06a19bd2/src/kudu/master/master-path-handlers.cc
----------------------------------------------------------------------
diff --git a/src/kudu/master/master-path-handlers.cc b/src/kudu/master/master-path-handlers.cc
index bf3d12d..e8fa753 100644
--- a/src/kudu/master/master-path-handlers.cc
+++ b/src/kudu/master/master-path-handlers.cc
@@ -271,13 +271,13 @@ void MasterPathHandlers::HandleTablePage(const Webserver::WebRequest& req,
 
     s = SchemaFromPB(l.data().pb.schema(), &schema);
     if (!s.ok()) {
-      (*output)["error"] = Substitute("Unable to decode schema: ", s.ToString());
+      (*output)["error"] = Substitute("Unable to decode schema: $0", s.ToString());
       return;
     }
     s = PartitionSchema::FromPB(l.data().pb.partition_schema(), schema, &partition_schema);
     if (!s.ok()) {
       (*output)["error"] =
-          Substitute("Unable to decode partition schema: ", s.ToString());
+          Substitute("Unable to decode partition schema: $0", s.ToString());
       return;
     }
     table->GetAllTablets(&tablets);

http://git-wip-us.apache.org/repos/asf/kudu/blob/06a19bd2/src/kudu/master/master-path-handlers.h
----------------------------------------------------------------------
diff --git a/src/kudu/master/master-path-handlers.h b/src/kudu/master/master-path-handlers.h
index 6195a74..72cff3f 100644
--- a/src/kudu/master/master-path-handlers.h
+++ b/src/kudu/master/master-path-handlers.h
@@ -59,7 +59,7 @@ class MasterPathHandlers {
 
   // Returns a pair (text, target) given a tserver's TSDescriptor and a tablet id.
   // - text is the http host and port for the tserver, if available, or the tserver's uuid.
-  // - target is a url to to the tablet page for the tablet on the tserver's webui,
+  // - target is a url to the tablet page for the tablet on the tserver's webui,
   //   or an empty string if no http address is available for the tserver.
   std::pair<std::string, std::string> TSDescToLinkPair(const TSDescriptor& desc,
                                                        const std::string& tablet_id) const;


[2/2] kudu git commit: Revert "[tests] fix flakiness in catalog_manager_tsk-itest"

Posted by al...@apache.org.
Revert "[tests] fix flakiness in catalog_manager_tsk-itest"

This reverts commit faa0b14effb6e15f9989d686e5a1f8e1040a1dd6.

Since the fix for KUDU-2149 is committed, the catalog_manager_tsk-itest
is no longer flaky even with original parameters. We want to
use the catalog_manager_tsk-itest with its original settings as a
canary for any further regressions in that area.

Notes on verification:
  With this change, and the fix for KUDU-2149 rolled-back,
  10 out of 1024 failed in when running the catalog_manager_tsk-itest
  test with --stress_cpu_threads=16:
    http://dist-test.cloudera.org//job?job_id=aserbin.1506033479.20652

  With this change, no failures were spotted in multiple 1K runs of the
  test with --stress_cpu_threads=16:
    http://dist-test.cloudera.org//job?job_id=aserbin.1506109518.28895

Change-Id: Ic7db0eef852a417da5d11480ccdb4f15019ea1da
Reviewed-on: http://gerrit.cloudera.org:8080/8129
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Reviewed-by: David Ribeiro Alves <da...@gmail.com>


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

Branch: refs/heads/master
Commit: 9c1997ad3473ab3ce29061c4cd2aa11552967a98
Parents: 06a19bd
Author: Alexey Serbin <as...@cloudera.com>
Authored: Fri Sep 22 15:02:23 2017 -0700
Committer: Alexey Serbin <as...@cloudera.com>
Committed: Fri Sep 22 22:46:34 2017 +0000

----------------------------------------------------------------------
 src/kudu/integration-tests/catalog_manager_tsk-itest.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/9c1997ad/src/kudu/integration-tests/catalog_manager_tsk-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/catalog_manager_tsk-itest.cc b/src/kudu/integration-tests/catalog_manager_tsk-itest.cc
index e573097..acdeba9 100644
--- a/src/kudu/integration-tests/catalog_manager_tsk-itest.cc
+++ b/src/kudu/integration-tests/catalog_manager_tsk-itest.cc
@@ -61,7 +61,7 @@ class CatalogManagerTskITest : public KuduTest {
       : num_masters_(3),
         num_tservers_(1),
 #if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER)
-        hb_interval_ms_(64),
+        hb_interval_ms_(32),
         run_time_seconds_(5)
 #else
         hb_interval_ms_(16),