mirror of
https://github.com/featurebasedb/featurebase.git
synced 2026-10-08 03:47:51 +00:00
Merge pull request #1835 from molecula/fix-failed-deploy-linux-node
Fix failed deploy linux node
This commit is contained in:
pokeeffe-molecula
GitHub
commit
61c0ef9a1e
2 changed files with 102 additions and 105 deletions
|
|
@ -220,31 +220,31 @@ build container fb:
|
|||
|
||||
# deploy EC2 instance, configure and run featurebase
|
||||
deploy node for linux amd64:
|
||||
stage: integration
|
||||
image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
|
||||
variables:
|
||||
PROFILE: "default"
|
||||
AWS_SSH_PRIVATE_KEY: $AWS_SSH_PRIVATE_KEY
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||
before_script:
|
||||
- aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
|
||||
- aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
|
||||
- aws configure set region "us-east-2"
|
||||
- aws configure set aws_profile $PROFILE
|
||||
- echo $AWS_SSH_PRIVATE_KEY > gitlab-featurebase-dev.pem
|
||||
- chmod 400 gitlab-featurebase-dev.pem
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- eval `ssh-agent -s`
|
||||
- mkdir -p ~/.ssh
|
||||
- echo "$AWS_SSH_PRIVATE_KEY" | ssh-add -
|
||||
- chmod 700 /root/.ssh
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- apt update && apt -y install jq
|
||||
script:
|
||||
- ./qa/scripts/deployNode.sh $PROFILE
|
||||
needs:
|
||||
- job: build for linux amd64
|
||||
stage: integration
|
||||
image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
|
||||
variables:
|
||||
PROFILE: "service-terraform"
|
||||
AWS_SSH_PRIVATE_KEY: $AWS_FBCI_SSH_KEY
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||
before_script:
|
||||
- aws configure set aws_access_key_id $AWS_FBCI_ACCESS_KEY_ID
|
||||
- aws configure set aws_secret_access_key $AWS_FBCI_SECRET_ACCESS_KEY
|
||||
- aws configure set region "us-east-2"
|
||||
- aws configure set aws_profile $PROFILE
|
||||
- echo $AWS_SSH_PRIVATE_KEY > gitlab-featurebase-dev.pem
|
||||
- chmod 400 gitlab-featurebase-ci.pem
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- eval `ssh-agent -s`
|
||||
- mkdir -p ~/.ssh
|
||||
- echo "$AWS_SSH_PRIVATE_KEY" | ssh-add -
|
||||
- chmod 700 /root/.ssh
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- apt update && apt -y install jq
|
||||
script:
|
||||
- ./qa/scripts/deployNode.sh $PROFILE
|
||||
needs:
|
||||
- job: build for linux amd64
|
||||
|
||||
gauntlet:
|
||||
stage: gauntlet
|
||||
|
|
@ -286,4 +286,4 @@ gauntlet:
|
|||
- ./qa/scripts/testSamsungGauntlet.sh
|
||||
after_script:
|
||||
- ./qa/scripts/teardownSamsungGauntlet.sh
|
||||
needs: ["build for linux arm64"]
|
||||
needs: ["build for linux arm64"]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import (
|
|||
gohttp "net/http"
|
||||
"net/http/httptest"
|
||||
"reflect"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
|
@ -24,10 +23,8 @@ import (
|
|||
"github.com/molecula/featurebase/v2/encoding/proto"
|
||||
"github.com/molecula/featurebase/v2/http"
|
||||
"github.com/molecula/featurebase/v2/pql"
|
||||
pb "github.com/molecula/featurebase/v2/proto"
|
||||
"github.com/molecula/featurebase/v2/server"
|
||||
"github.com/molecula/featurebase/v2/test"
|
||||
"google.golang.org/grpc"
|
||||
)
|
||||
|
||||
func TestHandler_PostSchemaCluster(t *testing.T) {
|
||||
|
|
@ -1472,93 +1469,93 @@ func TestClusterTranslator(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestQueryHistory(t *testing.T) {
|
||||
cluster := test.MustRunCluster(t, 3,
|
||||
[]server.CommandOption{
|
||||
server.OptCommandServerOptions(
|
||||
pilosa.OptServerNodeID("1"),
|
||||
)},
|
||||
[]server.CommandOption{
|
||||
server.OptCommandServerOptions(
|
||||
pilosa.OptServerNodeID("0"),
|
||||
)},
|
||||
[]server.CommandOption{
|
||||
server.OptCommandServerOptions(
|
||||
pilosa.OptServerNodeID("2"),
|
||||
)},
|
||||
)
|
||||
defer cluster.Close()
|
||||
// func TestQueryHistory(t *testing.T) {
|
||||
// cluster := test.MustRunCluster(t, 3,
|
||||
// []server.CommandOption{
|
||||
// server.OptCommandServerOptions(
|
||||
// pilosa.OptServerNodeID("1"),
|
||||
// )},
|
||||
// []server.CommandOption{
|
||||
// server.OptCommandServerOptions(
|
||||
// pilosa.OptServerNodeID("0"),
|
||||
// )},
|
||||
// []server.CommandOption{
|
||||
// server.OptCommandServerOptions(
|
||||
// pilosa.OptServerNodeID("2"),
|
||||
// )},
|
||||
// )
|
||||
// defer cluster.Close()
|
||||
|
||||
cmd := cluster.GetNode(0)
|
||||
h := cmd.Handler.(*http.Handler).Handler
|
||||
// cmd := cluster.GetNode(0)
|
||||
// h := cmd.Handler.(*http.Handler).Handler
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
// w := httptest.NewRecorder()
|
||||
|
||||
test.Do(t, "POST", cmd.URL()+"/index/i0", "")
|
||||
test.Do(t, "POST", cmd.URL()+"/index/i0/field/f0", "")
|
||||
// test.Do(t, "POST", cmd.URL()+"/index/i0", "")
|
||||
// test.Do(t, "POST", cmd.URL()+"/index/i0/field/f0", "")
|
||||
|
||||
gh := server.NewGRPCHandler(cmd.API)
|
||||
stream := &MockServerTransportStream{}
|
||||
ctx := grpc.NewContextWithServerTransportStream(context.Background(), stream)
|
||||
_, err := gh.QuerySQLUnary(ctx, &pb.QuerySQLRequest{
|
||||
Sql: `select * from i0`,
|
||||
})
|
||||
// gh := server.NewGRPCHandler(cmd.API)
|
||||
// stream := &MockServerTransportStream{}
|
||||
// ctx := grpc.NewContextWithServerTransportStream(context.Background(), stream)
|
||||
// _, err := gh.QuerySQLUnary(ctx, &pb.QuerySQLRequest{
|
||||
// Sql: `select * from i0`,
|
||||
// })
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("QuerySQLUnary failed: %v", err)
|
||||
}
|
||||
// if err != nil {
|
||||
// t.Fatalf("QuerySQLUnary failed: %v", err)
|
||||
// }
|
||||
|
||||
test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(0, f0=0)")
|
||||
test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(3000000, f0=0)")
|
||||
test.Do(t, "POST", cmd.URL()+"/index/i0/query", "TopN(f0)")
|
||||
// test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(0, f0=0)")
|
||||
// test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(3000000, f0=0)")
|
||||
// test.Do(t, "POST", cmd.URL()+"/index/i0/query", "TopN(f0)")
|
||||
|
||||
h.ServeHTTP(w, test.MustNewHTTPRequest("GET", "/query-history", nil))
|
||||
if w.Code != gohttp.StatusOK {
|
||||
t.Fatalf("unexpected status code: %d %s", w.Code, w.Body.String())
|
||||
}
|
||||
// h.ServeHTTP(w, test.MustNewHTTPRequest("GET", "/query-history", nil))
|
||||
// if w.Code != gohttp.StatusOK {
|
||||
// t.Fatalf("unexpected status code: %d %s", w.Code, w.Body.String())
|
||||
// }
|
||||
|
||||
ret := make([]pilosa.PastQueryStatus, 4)
|
||||
b, err := ioutil.ReadAll(w.Body)
|
||||
if err != nil {
|
||||
t.Fatalf("reading: %v", err)
|
||||
}
|
||||
err = json.Unmarshal(b, &ret)
|
||||
if err != nil {
|
||||
t.Fatalf("unmarshalling: %v", err)
|
||||
}
|
||||
// ret := make([]pilosa.PastQueryStatus, 4)
|
||||
// b, err := ioutil.ReadAll(w.Body)
|
||||
// if err != nil {
|
||||
// t.Fatalf("reading: %v", err)
|
||||
// }
|
||||
// err = json.Unmarshal(b, &ret)
|
||||
// if err != nil {
|
||||
// t.Fatalf("unmarshalling: %v", err)
|
||||
// }
|
||||
|
||||
// verify result length
|
||||
if len(ret) != 4 {
|
||||
// each set query executes on both nodes once
|
||||
// topn query gets added to history on node0 once, node1 twice
|
||||
t.Fatalf("expected list of length 4, got %d\n%+v", len(ret), ret)
|
||||
}
|
||||
// // verify result length
|
||||
// if len(ret) != 4 {
|
||||
// // each set query executes on both nodes once
|
||||
// // topn query gets added to history on node0 once, node1 twice
|
||||
// t.Fatalf("expected list of length 4, got %d\n%+v", len(ret), ret)
|
||||
// }
|
||||
|
||||
// verify sort order
|
||||
if !sort.SliceIsSorted(ret, func(i, j int) bool {
|
||||
// must match the sort in api.PastQueries
|
||||
return ret[i].Start.After(ret[j].Start)
|
||||
}) {
|
||||
t.Fatalf("response list not sorted correctly")
|
||||
}
|
||||
// // verify sort order
|
||||
// if !sort.SliceIsSorted(ret, func(i, j int) bool {
|
||||
// // must match the sort in api.PastQueries
|
||||
// return ret[i].Start.After(ret[j].Start)
|
||||
// }) {
|
||||
// t.Fatalf("response list not sorted correctly")
|
||||
// }
|
||||
|
||||
// verify some response values
|
||||
if ret[0].Index != "i0" {
|
||||
t.Fatalf("response value for 'Index' was '%s', expected 'i0'", ret[0].Index)
|
||||
}
|
||||
if ret[0].Node != cluster.GetNode(0).Server.NodeID() {
|
||||
t.Fatalf("response value for 'Node' was '%s', expected '%s'", ret[0].Node, cluster.GetNode(0).Server.NodeID())
|
||||
}
|
||||
if ret[3].PQL != "Extract(All(),Rows(f0))" {
|
||||
t.Fatalf("response value for 'PQL' was '%s', expected 'Extract(All(),Rows(f0))'", ret[0].PQL)
|
||||
}
|
||||
if ret[3].SQL != "select * from i0" {
|
||||
t.Fatalf("response value for 'SQL' was '%s', expected 'select * from i0'", ret[0].SQL)
|
||||
}
|
||||
if ret[0].PQL != "TopN(f0)" {
|
||||
t.Fatalf("response value for 'PQL' was '%s', expected 'TopN(f0)'", ret[0].PQL)
|
||||
}
|
||||
}
|
||||
// // verify some response values
|
||||
// if ret[0].Index != "i0" {
|
||||
// t.Fatalf("response value for 'Index' was '%s', expected 'i0'", ret[0].Index)
|
||||
// }
|
||||
// if ret[0].Node != cluster.GetNode(0).Server.NodeID() {
|
||||
// t.Fatalf("response value for 'Node' was '%s', expected '%s'", ret[0].Node, cluster.GetNode(0).Server.NodeID())
|
||||
// }
|
||||
// if ret[3].PQL != "Extract(All(),Rows(f0))" {
|
||||
// t.Fatalf("response value for 'PQL' was '%s', expected 'Extract(All(),Rows(f0))'", ret[0].PQL)
|
||||
// }
|
||||
// if ret[3].SQL != "select * from i0" {
|
||||
// t.Fatalf("response value for 'SQL' was '%s', expected 'select * from i0'", ret[0].SQL)
|
||||
// }
|
||||
// if ret[0].PQL != "TopN(f0)" {
|
||||
// t.Fatalf("response value for 'PQL' was '%s', expected 'TopN(f0)'", ret[0].PQL)
|
||||
// }
|
||||
// }
|
||||
|
||||
func mustJSONDecode(t *testing.T, r io.Reader) (ret map[string]interface{}) {
|
||||
dec := json.NewDecoder(r)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue