Release note: None

build/builder.sh

@@ -3,7 +3,7 @@
set -euo pipefail

image=cockroachdb/builder
version=20180813-101406
version=20181015-212512

function init() {
  docker build --tag="${image}" "$(dirname "${0}")/builder"

build/builder/Dockerfile

@@ -197,6 +197,7 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key ad
# google-cloud-sdk - roachprod acceptance tests
# yarn - ui
# chrome - ui
# unzip - for installing awscli
RUN apt-get install -y --no-install-recommends \
    ccache \
    google-cloud-sdk \
@@ -207,7 +208,15 @@ RUN apt-get install -y --no-install-recommends \
    openjdk-8-jre \
    openssh-client \
    yarn \
    google-chrome-stable
    google-chrome-stable \
    unzip

# awscli - roachtests
# NB: we don't use apt-get because we need an up to date version of awscli
RUN curl -fsSL "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" && \
  unzip awscli-bundle.zip && \
  ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws && \
  rm -rf awscli-bundle.zip awscli-bundle

ENV PATH /opt/backtrace/bin:$PATH

c-deps/libroach/timebound.cc

@@ -28,6 +28,25 @@ class TimeBoundTblPropCollector : public rocksdb::TablePropertiesCollector {
  const char* Name() const override { return "TimeBoundTblPropCollector"; }

  rocksdb::Status Finish(rocksdb::UserCollectedProperties* properties) override {
    if (!last_value_.empty()) {
      // Check to see if an intent was the last key in the SSTable. If
      // it was, we need to extract the timestamp from the intent and
      // update the bounds to include that timestamp.
      cockroach::storage::engine::enginepb::MVCCMetadata meta;
      if (!meta.ParseFromArray(last_value_.data(), last_value_.size())) {
        // We're unable to parse the MVCCMetadata. Fail open by not
        // setting the min/max timestamp properties.
        return rocksdb::Status::OK();
      }
      if (meta.has_txn()) {
        // We have an intent, use the intent's timestamp to update the
        // timestamp bounds.
        std::string ts;
        EncodeTimestamp(ts, meta.timestamp().wall_time(), meta.timestamp().logical());
        UpdateBounds(ts);
      }
    }

    *properties = rocksdb::UserCollectedProperties{
        {"crdb.ts.min", ts_min_},
        {"crdb.ts.max", ts_max_},
@@ -40,25 +59,39 @@ class TimeBoundTblPropCollector : public rocksdb::TablePropertiesCollector {
                             uint64_t file_size) override {
    rocksdb::Slice unused;
    rocksdb::Slice ts;
    if (SplitKey(user_key, &unused, &ts) && !ts.empty()) {
    if (!SplitKey(user_key, &unused, &ts)) {
      return rocksdb::Status::OK();
    }

    if (!ts.empty()) {
      last_value_.clear();
      ts.remove_prefix(1);  // The NUL prefix.
      if (ts_max_.empty() || ts.compare(ts_max_) > 0) {
        ts_max_.assign(ts.data(), ts.size());
      }
      if (ts_min_.empty() || ts.compare(ts_min_) < 0) {
        ts_min_.assign(ts.data(), ts.size());
      }
      UpdateBounds(ts);
      return rocksdb::Status::OK();
    }

    last_value_.assign(value.data(), value.size());
    return rocksdb::Status::OK();
  }

  virtual rocksdb::UserCollectedProperties GetReadableProperties() const override {
    return rocksdb::UserCollectedProperties{};
  }

 private:
  void UpdateBounds(rocksdb::Slice ts) {
    if (ts_max_.empty() || ts.compare(ts_max_) > 0) {
      ts_max_.assign(ts.data(), ts.size());
    }
    if (ts_min_.empty() || ts.compare(ts_min_) < 0) {
      ts_min_.assign(ts.data(), ts.size());
    }
  }

 private:
  std::string ts_min_;
  std::string ts_max_;
  std::string last_value_;
};

class TimeBoundTblPropCollectorFactory : public rocksdb::TablePropertiesCollectorFactory {

cloud/kubernetes/client-secure.yaml

@@ -15,7 +15,7 @@ spec:
  # In addition to the client certificate and key, the init-certs entrypoint will symlink
  # the cluster CA to the certs directory.
  - name: init-certs
    image: cockroachdb/cockroach-k8s-request-cert:0.3
    image: cockroachdb/cockroach-k8s-request-cert:0.4
    imagePullPolicy: IfNotPresent
    command:
    - "/bin/ash"

cloud/kubernetes/cluster-init-secure.yaml

@@ -17,7 +17,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/cockroachdb-statefulset-secure.yaml

@@ -163,7 +163,7 @@ spec:
      # In addition to the node certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/example-app-secure.yaml

@@ -22,7 +22,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/performance/cockroachdb-daemonset-secure.yaml

@@ -162,7 +162,7 @@ spec:
      # In addition to the node certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml

@@ -194,7 +194,7 @@ spec:
      # In addition to the node certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.6/client-secure.yaml

@@ -15,7 +15,7 @@ spec:
  # In addition to the client certificate and key, the init-certs entrypoint will symlink
  # the cluster CA to the certs directory.
  - name: init-certs
    image: cockroachdb/cockroach-k8s-request-cert:0.3
    image: cockroachdb/cockroach-k8s-request-cert:0.4
    imagePullPolicy: IfNotPresent
    command:
    - "/bin/ash"

cloud/kubernetes/v1.6/cluster-init-secure.yaml

@@ -17,7 +17,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.6/cockroachdb-statefulset-secure.yaml

@@ -149,7 +149,7 @@ spec:
      # In addition to the node certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.6/example-app-secure.yaml

@@ -22,7 +22,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.7/client-secure.yaml

@@ -15,7 +15,7 @@ spec:
  # In addition to the client certificate and key, the init-certs entrypoint will symlink
  # the cluster CA to the certs directory.
  - name: init-certs
    image: cockroachdb/cockroach-k8s-request-cert:0.3
    image: cockroachdb/cockroach-k8s-request-cert:0.4
    imagePullPolicy: IfNotPresent
    command:
    - "/bin/ash"

cloud/kubernetes/v1.7/cluster-init-secure.yaml

@@ -17,7 +17,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.7/cockroachdb-statefulset-secure.yaml

@@ -161,7 +161,7 @@ spec:
      # In addition to the node certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"

cloud/kubernetes/v1.7/example-app-secure.yaml

@@ -22,7 +22,7 @@ spec:
      # In addition to the client certificate and key, the init-certs entrypoint will symlink
      # the cluster CA to the certs directory.
      - name: init-certs
        image: cockroachdb/cockroach-k8s-request-cert:0.3
        image: cockroachdb/cockroach-k8s-request-cert:0.4
        imagePullPolicy: IfNotPresent
        command:
        - "/bin/ash"