Show memory usage in 'status' command output

Signed-off-by: Yevhen Vydolob <[email protected]>

cmd/crc/cmd/status.go

@@ -43,6 +43,8 @@ type status struct {
 	DiskSize         int64                        `json:"diskSize,omitempty"`
 	CacheUsage       int64                        `json:"cacheUsage,omitempty"`
 	CacheDir         string                       `json:"cacheDir,omitempty"`
+	RAMSize          int64                        `json:"ramSize,omitempty"`
+	RAMUsage         int64                        `json:"ramUsage,omitempty"`
 	Preset           preset.Preset                `json:"preset"`
 }
 
@@ -80,6 +82,8 @@ func getStatus(client *daemonclient.Client, cacheDir string) *status {
 		PodmanVersion:    clusterStatus.PodmanVersion,
 		DiskUsage:        clusterStatus.DiskUse,
 		DiskSize:         clusterStatus.DiskSize,
+		RAMSize:          clusterStatus.RAMSize,
+		RAMUsage:         clusterStatus.RAMUse,
 		CacheUsage:       size,
 		CacheDir:         cacheDir,
 		Preset:           clusterStatus.Preset,
@@ -108,6 +112,10 @@ func (s *status) prettyPrintTo(writer io.Writer) error {
 	}
 
 	lines = append(lines,
+		line{"RAM Usage", fmt.Sprintf(
+			"%s of %s",
+			units.HumanSize(float64(s.RAMUsage)),
+			units.HumanSize(float64(s.RAMSize)))},
 		line{"Disk Usage", fmt.Sprintf(
 			"%s of %s (Inside the CRC VM)",
 			units.HumanSize(float64(s.DiskUsage)),

cmd/crc/cmd/status_test.go

@@ -64,6 +64,7 @@ func TestPlainStatus(t *testing.T) {
 	expected := `CRC VM:          Running
 OpenShift:       Running (v4.5.1)
 Podman:          3.3.1
+RAM Usage:       0B of 0B
 Disk Usage:      10GB of 20GB (Inside the CRC VM)
 Cache Usage:     10kB
 Cache Directory: %s
@@ -95,6 +96,7 @@ func TestStatusWithoutPodman(t *testing.T) {
 
 	expected := `CRC VM:          Running
 OpenShift:       Running (v4.5.1)
+RAM Usage:       0B of 0B
 Disk Usage:      10GB of 20GB (Inside the CRC VM)
 Cache Usage:     10kB
 Cache Directory: %s
@@ -170,3 +172,37 @@ func TestJsonStatusWithError(t *testing.T) {
 `
 	assert.Equal(t, expected, out.String())
 }
+
+func TestStatusWithMemoryPodman(t *testing.T) {
+	cacheDir, err := ioutil.TempDir("", "cache")
+	require.NoError(t, err)
+	defer os.RemoveAll(cacheDir)
+
+	client := mocks.NewClient(t)
+	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+
+	client.On("Status").Return(apiClient.ClusterStatusResult{
+		CrcStatus:        string(state.Running),
+		OpenshiftStatus:  string(types.OpenshiftRunning),
+		OpenshiftVersion: "4.5.1",
+		DiskUse:          10_000_000_000,
+		DiskSize:         20_000_000_000,
+		RAMSize:          1_000_000,
+		RAMUse:           900_000,
+		Preset:           preset.OpenShift,
+	}, nil)
+
+	out := new(bytes.Buffer)
+	assert.NoError(t, runStatus(out, &daemonclient.Client{
+		APIClient: client,
+	}, cacheDir, ""))
+
+	expected := `CRC VM:          Running
+OpenShift:       Running (v4.5.1)
+RAM Usage:       900kB of 1MB
+Disk Usage:      10GB of 20GB (Inside the CRC VM)
+Cache Usage:     10kB
+Cache Directory: %s
+`
+	assert.Equal(t, fmt.Sprintf(expected, cacheDir), out.String())
+}

pkg/crc/api/api_client_test.go

@@ -72,6 +72,8 @@ func TestStatus(t *testing.T) {
 			PodmanVersion:    "3.3.1",
 			DiskUse:          int64(10000000000),
 			DiskSize:         int64(20000000000),
+			RAMUse:           int64(1000),
+			RAMSize:          int64(2000),
 			Preset:           preset.OpenShift,
 		},
 		statusResult,

pkg/crc/api/api_http_test.go

@@ -228,7 +228,7 @@ var testCases = []testCase{
 	// status
 	{
 		request:  get("status"),
-		response: jSon(`{"CrcStatus":"Running","OpenshiftStatus":"Running","OpenshiftVersion":"4.5.1","PodmanVersion":"3.3.1","DiskUse":10000000000,"DiskSize":20000000000,"Preset":"openshift"}`),
+		response: jSon(`{"CrcStatus":"Running","OpenshiftStatus":"Running","OpenshiftVersion":"4.5.1","PodmanVersion":"3.3.1","DiskUse":10000000000,"DiskSize":20000000000,"RAMUse":1000,"RAMSize":2000,"Preset":"openshift"}`),
 	},
 
 	// status with failure

pkg/crc/api/client/types.go

@@ -25,20 +25,22 @@ type ClusterStatusResult struct {
 	PodmanVersion    string `json:"PodmanVersion,omitempty"`
 	DiskUse          int64
 	DiskSize         int64
+	RAMUse           int64
+	RAMSize          int64
 	Preset           preset.Preset
 }
 
 type ConsoleResult struct {
 	ClusterConfig types.ClusterConfig
 }
 
-// setOrUnsetConfigResult struct is used to return the result of
+// SetOrUnsetConfigResult struct is used to return the result of
 // setconfig/unsetconfig command
 type SetOrUnsetConfigResult struct {
 	Properties []string
 }
 
-// getConfigResult struct is used to return the result of getconfig command
+// GetConfigResult struct is used to return the result of getconfig command
 type GetConfigResult struct {
 	Configs map[string]interface{}
 }

pkg/crc/api/handlers.go

@@ -69,6 +69,8 @@ func (h *Handler) Status(c *context) error {
 		PodmanVersion:    res.PodmanVersion,
 		DiskUse:          res.DiskUse,
 		DiskSize:         res.DiskSize,
+		RAMSize:          res.RAMSize,
+		RAMUse:           res.RAMUse,
 		Preset:           res.Preset,
 	})
 }

pkg/crc/cluster/cluster.go

@@ -82,6 +82,28 @@ func GetRootPartitionUsage(sshRunner *ssh.Runner) (int64, int64, error) {
 	return diskSize, diskUsage, nil
 }
 
+// GetRAMUsage return RAM size and RAM usage in bytes
+func GetRAMUsage(sshRunner *ssh.Runner) (int64, int64, error) {
+	cmd := "awk '/^Mem/ {print $2,$3}' <(free -b)"
+	out, _, err := sshRunner.Run(cmd)
+
+	if err != nil {
+		return 0, 0, err
+	}
+
+	ramDetails := strings.Split(strings.TrimSpace(out), " ")
+	ramSize, err := strconv.ParseInt(ramDetails[0], 10, 64)
+	if err != nil {
+		return 0, 0, err
+	}
+	ramUsage, err := strconv.ParseInt(ramDetails[1], 10, 64)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	return ramSize, ramUsage, nil
+}
+
 func EnsureSSHKeyPresentInTheCluster(ctx context.Context, ocConfig oc.Config, sshPublicKeyPath string) error {
 	sshPublicKeyByte, err := ioutil.ReadFile(sshPublicKeyPath)
 	if err != nil {

pkg/crc/machine/client.go

@@ -34,6 +34,7 @@ type client struct {
 	config crcConfig.Storage
 
 	diskDetails *memoize.Memoizer
+	ramDetails  *memoize.Memoizer
 }
 
 func NewClient(name string, debug bool, config crcConfig.Storage) Client {
@@ -42,6 +43,7 @@ func NewClient(name string, debug bool, config crcConfig.Storage) Client {
 		debug:       debug,
 		config:      config,
 		diskDetails: memoize.NewMemoizer(time.Minute, 5*time.Minute),
+		ramDetails:  memoize.NewMemoizer(30*time.Second, 2*time.Minute),
 	}
 }
 

pkg/crc/machine/fakemachine/client.go

@@ -105,6 +105,8 @@ func (c *Client) Status() (*types.ClusterStatusResult, error) {
 		PodmanVersion:    "3.3.1",
 		DiskUse:          10_000_000_000,
 		DiskSize:         20_000_000_000,
+		RAMSize:          2_000,
+		RAMUse:           1_000,
 		Preset:           preset.OpenShift,
 	}, nil
 }

pkg/crc/machine/status.go

@@ -65,6 +65,11 @@ func (client *client) Status() (*types.ClusterStatusResult, error) {
 		clusterStatusResult.PodmanVersion = vm.bundle.GetPodmanVersion()
 		clusterStatusResult.Preset = preset.Podman
 	}
+
+	ramSize, ramUse := client.getRAMStatus(vm)
+	clusterStatusResult.RAMSize = ramSize
+	clusterStatusResult.RAMUse = ramUse
+
 	return clusterStatusResult, nil
 }
 
@@ -104,3 +109,25 @@ func getOpenShiftStatus(ctx context.Context, ip string) types.OpenshiftStatus {
 	}
 	return types.OpenshiftStopped
 }
+
+func (client *client) getRAMStatus(vm *virtualMachine) (int64, int64) {
+	ram, err, _ := client.ramDetails.Memoize("ram", func() (interface{}, error) {
+		sshRunner, err := vm.SSHRunner()
+		if err != nil {
+			return nil, errors.Wrap(err, "Error creating the ssh client")
+		}
+		defer sshRunner.Close()
+		ramSize, ramUse, err := cluster.GetRAMUsage(sshRunner)
+		if err != nil {
+			return nil, err
+		}
+		return []int64{ramSize, ramUse}, nil
+	})
+
+	if err != nil {
+		logging.Debugf("Cannot get RAM usage: %v", err)
+		return 0, 0
+	}
+
+	return ram.([]int64)[0], ram.([]int64)[1]
+}

pkg/crc/machine/types/types.go

@@ -69,6 +69,8 @@ type ClusterStatusResult struct {
 	PodmanVersion    string
 	DiskUse          int64
 	DiskSize         int64
+	RAMUse           int64
+	RAMSize          int64
 	Preset           crcpreset.Preset
 }